Campbell Barton 685b6e7db9 svn merge ^/trunk/blender -r41227:41230 . --accept=theirs-full

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

..

blender

svn merge ^/trunk/blender -r41227:41230 . --accept=theirs-full

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

blenderplayer

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

creator

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

darwin

replace former applescript with an editable one

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

gameengine

svn merge ^/trunk/blender -r41227:41230 . --accept=theirs-full

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

icons

set svn end of lines to native

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

tests

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +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