Atlante45 e73f8baf93 Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix		2015-01-08 11:54:54 -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 branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix	2015-01-08 11:54:54 -08:00
ui	remove more references to voxels	2015-01-07 16:09:56 -08:00
CMakeLists.txt	fix to add GLEW debug library	2015-01-07 22:08:01 +01:00
interface.icns
interface_en.ts	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in