Leonardo Murillo f5dfc7d3e4 Merge branch 'master' of https://github.com/highfidelity/hifi		2015-12-02 10:42:57 -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	Merge branch 'master' into tony/remove-joint-states	2015-11-25 13:55:23 -08:00
src	Merge pull request #6487 from ctrlaltdavid/20740	2015-12-01 15:40:48 -08:00
ui	ScriptEditor Improvements:	2015-10-14 20:37:47 +02:00
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-30 08:38:13 -06:00