Sam Gateau d6f74aa0ad Merge branch 'master' of https://github.com/highfidelity/hifi into orange		2015-04-06 09:56:16 -07:00
..
external	Merge branch 'master' into oculus_old_renderer	2015-03-30 16:36:00 -07:00
icon	fix check for debug/release icon	2015-01-30 15:41:44 -08:00
resources	editEntities.js --> edit.js	2015-03-27 14:40:16 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-06 09:56:16 -07:00
ui	Update script editor to set icons programatically	2015-04-02 09:10:47 -07: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