howard-stearns 1ddcc62db9 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2		2015-11-20 14:05:40 -08: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	cleanup	2015-11-19 11:55:22 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2	2015-11-20 14:05:40 -08:00
ui	ScriptEditor Improvements:	2015-10-14 20:37:47 +02:00
CMakeLists.txt	Add recording classes	2015-11-06 11:14:46 -08:00