Campbell Barton d92b5ea04a svn merge ^/trunk/blender -r40390:40394

2011-09-23 07:20:27 +00:00

..

blender

svn merge ^/trunk/blender -r40390:40394

2011-09-23 07:20:27 +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 ^/trunk/blender -r40371:40372

2011-09-23 05:59:37 +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

…

SConscript

…