svn merge ^/trunk/blender -r46463:HEAD
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Fri, 11 May 2012 19:26:43 +0000 (19:26 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Fri, 11 May 2012 19:26:43 +0000 (19:26 +0000)
commit736c0ca6e0034ad5418e41ae539afe29a9a2365f
treee8e66c6f4c5df67897e037bb86c23002a5610acb
parent8776458e74f329e61977f4539be00bed9e2f0d10
parenta045ad90557a1029b112023c9d6208e7807decd2
svn merge ^/trunk/blender -r46463:HEAD
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/object/object_vgroup.c