Campbell Barton 6cc8f734c0 svn merge -r36603:36651 https://svn.blender.org/svnroot/bf-blender/trunk/blender \nwith some manual edits

2011-05-13 04:04:53 +00:00

..

include

svn merge -r36583:36603 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-11 00:19:13 +00:00

raytrace

copied across changes which were missed by merging.

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

source

svn merge -r36603:36651 https://svn.blender.org/svnroot/bf-blender/trunk/blender \nwith some manual edits

2011-05-13 04:04:53 +00:00