Stephen Birarda 68f9334628 cleanup Faceplus and Faceshift find modules, fix for OVR stitched include		2014-07-17 16:37:10 -07:00
..
external	merge upstream/master into andrew/thermonuclear (AKA samcake/19734)	2014-07-14 09:10:27 -07:00
resources	Merged from master. Get rid of redundant GL fog states. Moved local light parameters to shader uniform arrays.	2014-07-09 13:27:42 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into select-library	2014-07-17 16:12:24 -07:00
ui	Added send data option to prefs	2014-07-16 17:56:29 -07:00
CMakeLists.txt	cleanup Faceplus and Faceshift find modules, fix for OVR stitched include	2014-07-17 16:37:10 -07:00
interface.icns	update the interface icon	2014-07-07 11:46:57 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in