Campbell Barton a7815053ef svn merge -r37600:37700 https://svn.blender.org/svnroot/bf-blender/trunk/blender ...

manually merged source/blender/editors/uvedit/uvedit_unwrap_ops.c

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

..

include

svn merge -r37600:37700 https://svn.blender.org/svnroot/bf-blender/trunk/blender

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

raytrace

copied across changes which were missed by merging.

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

source

svn merge -r37600:37700 https://svn.blender.org/svnroot/bf-blender/trunk/blender

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