svn merge ^/trunk/blender -r47023:HEAD
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Sun, 17 Jun 2012 04:14:44 +0000 (04:14 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Sun, 17 Jun 2012 04:14:44 +0000 (04:14 +0000)
commitbf3d0ca8dad529e5ca25550c3c31c055c76084ff
tree1bbfed87f441b899b5cd5bb89ef9d336dd6eb06a
parent9d32423f3e695f8bdd5a0d1b032b5e822613977a
parent0df30d1063cc185770451b3b2ebf3fcd0341c642
svn merge ^/trunk/blender -r47023:HEAD
source/blender/editors/object/object_ops.c
source/blender/editors/object/object_vgroup.c