ZappoMan d3aacc3838 Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorTest ... Conflicts: interface/src/MetavoxelSystem.cpp		2014-12-05 10:11:49 -08:00
..
external	fix typo from overwrite of gverb/readme.txt	2014-11-26 10:41:23 -08:00
resources	hack a separate emissive information in the g-buffer	2014-11-25 18:27:49 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorTest	2014-12-05 10:11:49 -08:00
ui
CMakeLists.txt
interface.icns
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in