svn merge -r40195:40197 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Wed, 14 Sep 2011 01:54:04 +0000 (01:54 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 14 Sep 2011 01:54:04 +0000 (01:54 +0000)
commitc3a718702fb15a3517e5c54c92af032b21fc5d86
treebc2bebcfe56cb4dcb65276b3969ddb4a3eace9b9
parentac51152ec507cb141a598d2edd7fe32840999a94
parent9b06435653522400c7136ae3cfc6ee6b52ae1378
svn merge -r40195:40197 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/editors/armature/editarmature.c