Brad Hefta-Gaub fc33de28a0 Merge pull request #3399 from huffman/19831 ... Code Review for Job #19831		2014-09-12 13:45:20 -07:00
..
external	Bring libovr build instructions up to date	2014-08-21 19:24:09 -07:00
resources	Merge branch 'master' of https://github.com/highfidelity/hifi into 19964	2014-09-05 07:45:55 +02:00
src	Merge pull request #3399 from huffman/19831	2014-09-12 13:45:20 -07:00
ui	Add option to change Faceshift hostname.	2014-09-10 19:34:21 -07:00
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities	2014-08-28 21:19:56 -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