Campbell Barton e6e265b2b5 svn merge -r41779:41847 ^/trunk/blender

2011-11-15 02:58:06 +00:00

..

blender

svn merge -r41779:41847 ^/trunk/blender

2011-11-15 02:58:06 +00:00

blenderplayer

svn merge -r41779:41847 ^/trunk/blender

2011-11-15 02:58:06 +00:00

creator

svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build

2011-11-10 04:17:43 +00:00

darwin

replace former applescript with an editable one

2011-10-19 19:15:35 +00:00

gameengine

svn merge -r41751:41779 ^/trunk/blender

2011-11-15 02:05:32 +00:00

icons

set svn end of lines to native

2011-05-09 08:15:38 +00:00

tests

Cycles: svn merge -r41225:41232 ^/trunk/blender

2011-10-24 22:32:00 +00:00

CMakeLists.txt

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

SConscript

Code cleanup: remove source/kernel module, this wasn't really the kernel of

2011-05-06 20:18:42 +00:00