git.blender.org - blender-staging.git/commit

projects / blender-staging.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e005c31 22c68cd)

author	Campbell Barton <ideasman42@gmail.com>
	Mon, 25 Jul 2011 12:59:54 +0000 (12:59 +0000)
committer	Campbell Barton <ideasman42@gmail.com>
	Mon, 25 Jul 2011 12:59:54 +0000 (12:59 +0000)
commit	a7815053eff706f8c08ca774ed3dcddc884bb504
tree	e30457d40cba58cfbc19c4be3bce7090fa0c3f3c	tree
parent	e005c3136ecb72972b1e500a5710bebe63bdc50e	commit \| diff
parent	22c68cd748257e63391e6b23b1d0b7e5895d3121	commit \| diff

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	\|	diff2 \|	blob \| history
release/scripts/startup/bl_ui/space_info.py	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/BKE_blender.h	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/anim.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenlib/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/blender/editors/object/object_bake.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/physics/particle_edit.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/render/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/blender/editors/transform/transform_snap.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/uvedit/uvedit_unwrap_ops.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_object.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_explode.c	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/include/rayobject.h	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/convertblender.c	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/strand.c	diff1 \|	diff2 \|	blob \| history
source/blender/windowmanager/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/creator/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history

Repository to test new patches