Campbell Barton 58e7678952 svn merge ^/trunk/blender -r40370:40371		2011-09-22 16:30:33 +00:00
..
blender	svn merge ^/trunk/blender -r40370:40371	2011-09-22 16:30:33 +00:00
blenderplayer	svn merge -r40166:40279 ^/trunk/blender	2011-09-17 04:59:14 +00:00
creator	svn merge -r40166:40279 ^/trunk/blender	2011-09-17 04:59:14 +00:00
darwin	set svn end of lines to native	2011-05-09 08:15:38 +00:00
gameengine	svn merge -r40279:40295 ^/trunk/blender	2011-09-17 13:15:38 +00:00
icons	set svn end of lines to native	2011-05-09 08:15:38 +00:00
tests	minor warning fixes, also correct some float -> double promotions in shadeoutput.c	2011-09-02 03:32:57 +00:00
CMakeLists.txt	Code cleanup: remove source/kernel module, this wasn't really the kernel of	2011-05-06 20:18:42 +00:00
SConscript	Code cleanup: remove source/kernel module, this wasn't really the kernel of	2011-05-06 20:18:42 +00:00