svn merge ^/trunk/blender -r47023:HEAD

author Ove Murberg Henriksen <sorayasilvermoon@hotmail.com>

Sun, 17 Jun 2012 04:14:44 +0000 (04:14 +0000)

committer Ove Murberg Henriksen <sorayasilvermoon@hotmail.com>

Sun, 17 Jun 2012 04:14:44 +0000 (04:14 +0000)
author Ove Murberg Henriksen <sorayasilvermoon@hotmail.com>
Sun, 17 Jun 2012 04:14:44 +0000 (04:14 +0000)
committer Ove Murberg Henriksen <sorayasilvermoon@hotmail.com>
Sun, 17 Jun 2012 04:14:44 +0000 (04:14 +0000)
diff --cc source/blender/editors/object/object_ops.c
Simple merge
diff --cc source/blender/editors/object/object_vgroup.c
Simple merge
author	Ove Murberg Henriksen <sorayasilvermoon@hotmail.com>
	Sun, 17 Jun 2012 04:14:44 +0000 (04:14 +0000)
committer	Ove Murberg Henriksen <sorayasilvermoon@hotmail.com>
	Sun, 17 Jun 2012 04:14:44 +0000 (04:14 +0000)
		1	2
source/blender/editors/object/object_ops.c	patch \|	diff1 \|	diff2 \|	blob \| history
source/blender/editors/object/object_vgroup.c	patch \|	diff1 \|	diff2 \|	blob \| history