Andrew Meadows 8359e672bb merge upstream/master into andrew/ragdoll		2014-09-17 17:56:35 -07:00
..
external	Bring libovr build instructions up to date	2014-08-21 19:24:09 -07:00
resources	Allow specifying material opacity.	2014-09-16 17:52:39 -07:00
src	merge upstream/master into andrew/ragdoll	2014-09-17 17:56:35 -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