ZappoMan 873403a333 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing ... Conflicts: interface/src/Audio.cpp interface/src/Audio.h interface/src/Menu.cpp interface/src/Menu.h		2015-01-06 12:27:16 -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 branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing	2015-01-06 12:27:16 -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	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
InterfaceVersion.h.in