overte-HifiExperiments/interface
Andrzej Kapolka a5c8531aa1 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels
Conflicts:
	interface/src/Application.cpp
2013-12-17 13:46:44 -08:00
..
external Revert "add the resample library to interface" 2013-12-06 14:38:03 -08:00
resources Diffuse lighting. 2013-12-12 16:19:05 -08:00
src Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-17 13:46:44 -08:00
CMakeLists.txt Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-17 13:46:44 -08:00
interface.icns
InterfaceConfig.h.in Adding build sequence to Interface build 2013-12-16 11:03:49 -06:00
InterfaceVersion.h.in Tidy up 2013-12-16 11:05:08 -06:00