Brad Hefta-Gaub f33bd82ed8 Merge pull request #3395 from PhilipRosedale/master ... Updated move and butterfly scripts, entity renderer uses glutCube to temporarily fix crash		2014-09-11 14:32:14 -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 #3395 from PhilipRosedale/master	2014-09-11 14:32:14 -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
InterfaceConfig.h.in
InterfaceVersion.h.in