overte-HifiExperiments/interface
Andrzej Kapolka 652be27910 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
2013-12-12 15:36:37 -08:00
..
external remove PortAudio entirely 2013-12-03 12:38:26 -08:00
resources More work on rendering voxels. 2013-12-12 15:14:19 -08:00
src Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-12 15:36:37 -08:00
CMakeLists.txt Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-12 15:36:37 -08:00
interface.icns
InterfaceConfig.h.in