svn merge ^/trunk/blender -r49763:49774
authorCampbell Barton <ideasman42@gmail.com>
Fri, 10 Aug 2012 15:45:09 +0000 (15:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 10 Aug 2012 15:45:09 +0000 (15:45 +0000)
commit8d641ebf56fe628489836a157fbb3d2bb99fae83
treed621dcec36295a62e6465718de75af4a2e8b6b43
parentbfbea032286d0596ac70ccff576d598387177b26
parentb84c1dd59240560a6d681a3853c82eeac3b0d350
svn merge ^/trunk/blender -r49763:49774
SConstruct