svn merge ^/trunk/blender -r49939:49945
authorCampbell Barton <ideasman42@gmail.com>
Fri, 17 Aug 2012 08:25:23 +0000 (08:25 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 17 Aug 2012 08:25:23 +0000 (08:25 +0000)
commit99174eacc1ba3b04f3a94780c2d95f24d9dc3952
treed888619988cd3cf49aa60a7fa7a102f9d37e3d59
parent9af5d8f6dab04aaa2dafee0f1ae02b91eaa520a8
parent219fb7ad7908a2d3ddb8dfe77bd8e702202a7ff9
svn merge ^/trunk/blender -r49939:49945