Seth Alves 02c4730388 Merge branch 'master' of github.com:highfidelity/hifi into parents		2015-11-30 14:09:31 -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 github.com:highfidelity/hifi into parents	2015-11-30 14:09:31 -08:00
ui	ScriptEditor Improvements:	2015-10-14 20:37:47 +02:00
CMakeLists.txt	Fix for linker warning LNK4075 on Windows	2015-11-27 20:56:57 -08:00