Seth Alves b9ca509f07 Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup		2015-11-10 09:50:12 -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	changed the behaviour of Standard.LY input	2015-11-06 12:46:08 -08:00
src	Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup	2015-11-10 09:50:12 -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