Ryan Huffman 0105906dc7 Merge branch 'master' of github.com:highfidelity/hifi into camera-display ... Conflicts: examples/editEntities.js		2014-12-30 15:02:59 -08:00
..
external	fix typo from overwrite of gverb/readme.txt	2014-11-26 10:41:23 -08:00
resources	Moving the shaders used in Model.cpp from resources folder into the built-in executable	2014-12-30 12:35:00 -08:00
src	Merge branch 'master' of github.com:highfidelity/hifi into camera-display	2014-12-30 15:02:59 -08:00
ui	Revert "Worklist #20074"	2014-10-30 14:33:10 -07:00
CMakeLists.txt	merging with upstream master and origin temp0	2014-12-22 10:38:11 -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