Andrzej Kapolka 07efda89ef Merge branch 'master' of https://github.com/highfidelity/hifi into deference		2014-09-16 13:20:43 -07:00
..
external	Bring libovr build instructions up to date	2014-08-21 19:24:09 -07:00
resources	Glow fix for simple shader.	2014-09-15 17:33:07 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into deference	2014-09-16 13:20:43 -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	update the interface icon	2014-07-07 11:46:57 -07:00
interface_en.ts	importVoxels() JS override: specify file and location	2014-08-03 14:01:37 -04:00
InterfaceConfig.h.in
InterfaceVersion.h.in