Campbell Barton b709b52f46 svn merge -r37500:37600 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-24 13:21:54 +00:00

..

include

svn merge -r37335:37500 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-24 13:03:48 +00:00

raytrace

copied across changes which were missed by merging.

2011-05-09 02:45:52 +00:00

source

svn merge -r37500:37600 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-24 13:21:54 +00:00