Howard Stearns 6e4d0043c9 Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars		2015-10-29 10:32:12 -07:00
..
external	Update readme.txt	2015-09-15 00:29:12 +02:00
i18n	Updated english translation file	2015-10-15 11:15:06 -07:00
icon
resources	css and cfg filetypes are text in .gitattributes	2015-10-20 13:58:44 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars	2015-10-29 10:32:12 -07:00
ui	ScriptEditor Improvements:	2015-10-14 20:37:47 +02:00
CMakeLists.txt	Move GL utilities out to their own library	2015-10-27 15:53:42 -07:00