Stephen Birarda 60bdd206eb Merge branch 'master' of https://github.com/highfidelity/hifi into android		2015-01-19 12:35:22 -08:00
..
external	Merge branch 'master' of https://github.com/highfidelity/hifi into 20216	2015-01-15 02:28:31 +01: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 android	2015-01-19 12:35:22 -08:00
ui	changed "Load Scripts" label to be better understandable	2015-01-13 01:09:28 +01:00
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi into 20216	2015-01-15 02:28:31 +01:00
interface.icns	update the interface icon	2014-07-07 11:46:57 -07:00
interface_en.ts	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in