Sam Gateau f090a1868c qerge branch 'master' of https://github.com/highfidelity/hifi into temp0 ... q Please enter a commit message to explain why this merge is necessary,		2014-10-21 10:51:46 -07:00
..
external	remove Faceplus as a face tracker option	2014-10-15 15:13:52 -07:00
resources	Comment fix.	2014-10-14 18:24:44 -07:00
src	qerge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-10-21 10:51:46 -07:00
ui	Merge pull request #3593 from huffman/20024	2014-10-14 09:52:13 -07:00
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles	2014-10-16 20:36:28 -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