Campbell Barton 5065d4c744 svn merge -r39664:39762 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-29 00:46:56 +00:00

..

include

svn merge -r37900:38000 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-25 16:12:54 +00:00

raytrace

copied across changes which were missed by merging.

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

source

svn merge -r39664:39762 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-29 00:46:56 +00:00