Andrew Meadows 162854c5a5 Merge pull request #4025 from ZappoMan/voxelEctomy ... Voxel ectomy		2015-01-05 13:20:30 -08:00
..
external	fix typo from overwrite of gverb/readme.txt	2014-11-26 10:41:23 -08:00
resources	Merge pull request #4027 from huffman/grid-shader-updates	2015-01-05 13:00:05 -08:00
src	Merge pull request #4025 from ZappoMan/voxelEctomy	2015-01-05 13:20:30 -08:00
ui	Revert "Worklist #20074"	2014-10-30 14:33:10 -07:00
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy	2014-12-31 10:50:53 -08:00
interface.icns	update the interface icon	2014-07-07 11:46:57 -07:00
interface_en.ts	importVoxels() JS override: specify file and location	2014-08-03 14:01:37 -04:00
InterfaceConfig.h.in	missed copyright cleanups in apache header	2014-04-09 09:44:38 -07:00
InterfaceVersion.h.in	missed copyright cleanups in apache header	2014-04-09 09:44:38 -07:00