svn merge ^/trunk/blender -r49886:49890
authorCampbell Barton <ideasman42@gmail.com>
Tue, 14 Aug 2012 12:18:58 +0000 (12:18 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 14 Aug 2012 12:18:58 +0000 (12:18 +0000)
commit08f912e6d5fe843268d56728fa1c648ed18bb9ea
tree943c72713487e109d4114062ca74c7ada93f7a35
parent555b6afe2079c111389fd1bb9232b2e22faef416
parent34ebdcacfc26b7c42aa6c0aa4c03bf8aee72abac
svn merge ^/trunk/blender -r49886:49890