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

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

..

include

svn merge ^/trunk/blender -r41175:41200 --- will need to apply fix after

2011-10-24 07:56:42 +00:00

raytrace

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

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

source

svn merge ^/trunk/blender -r41230:41266

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