svn merge ^/trunk/blender -r49945:49947
authorCampbell Barton <ideasman42@gmail.com>
Fri, 17 Aug 2012 11:35:14 +0000 (11:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 17 Aug 2012 11:35:14 +0000 (11:35 +0000)
commit6a64f544b18f306b2a6842c572ce6208733b794d
treee5b3a9265ba63095dd2f3411e478d7e50ca0d794
parent99174eacc1ba3b04f3a94780c2d95f24d9dc3952
parentdac761057d16e264a74162ba625bdb3c6cf07fb4
svn merge ^/trunk/blender -r49945:49947