Brad Davis 49e7d42c2c Merge remote-tracking branch 'upstream/master' into HEAD		2015-10-30 10:07:40 -07: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 remote-tracking branch 'upstream/master' into HEAD	2015-10-30 10:07:40 -07:00
src	FIxing the mac build	2015-10-29 14:17:52 -07:00
ui	ScriptEditor Improvements:	2015-10-14 20:37:47 +02:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-30 10:07:40 -07:00