Campbell Barton da8a7928c9 svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

..

extern/include

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

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

intern

svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +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

svn merge ^/trunk/blender -r41200:41226 .

2011-10-24 08:45:55 +00:00