svn merge -r37600:37700 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jul 2011 12:59:54 +0000 (12:59 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jul 2011 12:59:54 +0000 (12:59 +0000)
commita7815053eff706f8c08ca774ed3dcddc884bb504
treee30457d40cba58cfbc19c4be3bce7090fa0c3f3c
parente005c3136ecb72972b1e500a5710bebe63bdc50e
parent22c68cd748257e63391e6b23b1d0b7e5895d3121
svn merge -r37600:37700 https://svn.blender.org/svnroot/bf-blender/trunk/blender

manually merged source/blender/editors/uvedit/uvedit_unwrap_ops.c
19 files changed:
doc/python_api/examples/bpy.props.4.py
release/scripts/startup/bl_ui/space_info.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/anim.c
source/blender/blenlib/CMakeLists.txt
source/blender/editors/object/object_bake.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/transform/transform_snap.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_object.c
source/blender/modifiers/intern/MOD_explode.c
source/blender/render/intern/include/rayobject.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/strand.c
source/blender/windowmanager/CMakeLists.txt
source/creator/CMakeLists.txt