Howard Stearns 70b1165393 Merge branch 'master' of https://github.com/highfidelity/hifi into away		2015-11-03 10:01:36 -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	Fix outro start times, and introduce away states (which are not used in C++ code, but are used in script).	2015-11-02 20:39:31 -08:00
src	Adding diagnostics to track down the 'black rectangles of death'	2015-11-02 21:55:35 -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