Campbell Barton 0f329ebdf1 svn merge -r36583:36603 https://svn.blender.org/svnroot/bf-blender/trunk/blender

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

..

modules

copied across changes which were missed by merging.

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

presets

copied across changes which were missed by merging.

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

startup

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

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

templates

copied across changes which were missed by merging.

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