ZappoMan 9e34dda7c9 Merge branch 'master' of https://github.com/highfidelity/hifi into LODUITweaks		2015-03-25 16:54:37 -07:00
..
external	Building with Sixense build requires four of the SDK libraries	2015-03-21 14:22:09 -07:00
icon	fix check for debug/release icon	2015-01-30 15:41:44 -08:00
resources	Rename edit-entities-commands.html to edit-commands.html	2015-03-24 13:43:10 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into LODUITweaks	2015-03-25 16:54:37 -07:00
ui	Switching to .com	2015-03-25 12:36:37 -06:00
CMakeLists.txt	Making nsight usage optional (still defaults to on)	2015-03-16 12:59:41 -07:00
interface_en.ts	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in