svn merge ^/trunk/blender -r46559:HEAD
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Tue, 15 May 2012 01:28:12 +0000 (01:28 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Tue, 15 May 2012 01:28:12 +0000 (01:28 +0000)
commit90759d424354d3ad2c3f4bd0552aea8f07454746
tree4da713bb34020aed378bb0c699e9751683d069ca
parent9331b5e92fc847841b04d8303132ac5779d9860c
parent232980eef01a0a6d5ef5b80ad9f9dfbc6ec584a0
svn merge ^/trunk/blender -r46559:HEAD
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/object/object_vgroup.c