Stojce Slavkovski 365d1eea10 Merge branch 'master' of https://github.com/worklist/hifi into 19461 ... Conflicts: interface/src/Menu.h		2013-12-17 20:15:40 +01:00
..
external	Revert "add the resample library to interface"	2013-12-06 14:38:03 -08:00
resources	added dialog for log data	2013-12-16 22:43:17 +01:00
src	Merge branch 'master' of https://github.com/worklist/hifi into 19461	2013-12-17 20:15:40 +01:00
CMakeLists.txt	Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions	2013-12-16 12:11:33 -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