Stephen Birarda ab7cbc0b76 Merge branch 'master' of https://github.com/highfidelity/hifi into injector-hybrid		2015-11-24 10:45:00 -06:00
..
external	Moving SDL2, Sixense and Faceshift to external projects	2015-10-30 00:57:51 -07:00
i18n	Updated english translation file	2015-10-15 11:15:06 -07:00
icon
resources	Move recording interface back to float/seconds	2015-11-16 14:44:22 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into injector-hybrid	2015-11-24 10:45:00 -06:00
ui	ScriptEditor Improvements:	2015-10-14 20:37:47 +02:00
CMakeLists.txt	Bundling and consolidating deployment package	2015-11-20 15:10:56 -06:00