ZappoMan cd92185c5b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork ... Conflicts: examples/newEditEntities.js interface/src/avatar/MyAvatar.cpp interface/src/avatar/MyAvatar.h libraries/entities/src/EntityTree.h		2014-12-03 15:07:47 -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 rayPickWork	2014-12-03 15:07:47 -08:00
ui	Revert "Worklist #20074"	2014-10-30 14:33:10 -07:00
CMakeLists.txt	Merge pull request #3652 from ctrlaltdavid/19976	2014-10-29 20:46:12 -07:00
interface.icns
interface_en.ts	importVoxels() JS override: specify file and location	2014-08-03 14:01:37 -04:00
InterfaceConfig.h.in
InterfaceVersion.h.in