svn merge ^/trunk/blender -r43085:43092
authorCampbell Barton <ideasman42@gmail.com>
Tue, 3 Jan 2012 07:33:11 +0000 (07:33 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 3 Jan 2012 07:33:11 +0000 (07:33 +0000)
1  2 
source/blender/editors/object/object_vgroup.c
source/blender/modifiers/SConscript

Simple merge