svn merge ^/trunk/blender -r49175:49177
authorCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jul 2012 13:02:54 +0000 (13:02 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jul 2012 13:02:54 +0000 (13:02 +0000)
commitc363fc3dcee52ace33679d3681d26da1967045fc
treef69d163dea3a696b0e0bda3629f8d3c60ee67e87
parentf7a1819559ba95dffb6c7cf319113b8d37888b5a
parent679847bd9922e01f6835e92856d3c00fe452656e
svn merge ^/trunk/blender -r49175:49177