Andrew Meadows 68c09c5b74 Merge 'threedtv' of https://github.com/ZappoMan/hifi for pull 1430		2014-01-02 11:59:57 -08:00
..
external	Revert "add the resample library to interface"	2013-12-06 14:38:03 -08:00
resources	Merge branch 'master' of https://github.com/worklist/hifi into 19461	2013-12-18 08:00:55 +01:00
src	Merge 'threedtv' of https://github.com/ZappoMan/hifi for pull 1430	2014-01-02 11:59:57 -08:00
CMakeLists.txt	Merge branch 'master' of https://github.com/worklist/hifi into metavoxels	2013-12-17 16:57:25 -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