Howard Stearns 4a54f2052e Merge branch 'master' of https://github.com/highfidelity/hifi into away		2015-11-03 17:42:38 -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	Merge branch 'master' of https://github.com/highfidelity/hifi into away	2015-11-03 17:42:38 -08:00
src	Merge pull request #6283 from hyperlogic/tony/one-update-for-every-render	2015-11-03 16:38:43 -08:00
ui	ScriptEditor Improvements:	2015-10-14 20:37:47 +02:00
CMakeLists.txt	Removing iviewhmd due to broken production builds	2015-11-02 23:49:03 -08:00