Brad Hefta-Gaub 476887b7ef Merge pull request #4055 from huffman/fix-overlays ... Update setting drawOnHUD and update to write lock for editOverlay		2015-01-07 10:56:18 -08:00
..
external	Script updates and fixes to highfidelity-public	2015-01-06 17:04:42 -08:00
resources	Merge pull request #4027 from huffman/grid-shader-updates	2015-01-05 13:00:05 -08:00
src	Merge pull request #4055 from huffman/fix-overlays	2015-01-07 10:56:18 -08:00
ui	fix ui file	2015-01-06 09:55:49 -08:00
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy	2014-12-31 10:50:53 -08:00
interface.icns
interface_en.ts	importVoxels() JS override: specify file and location	2014-08-03 14:01:37 -04:00
InterfaceConfig.h.in
InterfaceVersion.h.in