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)
1  2 
SConstruct

diff --cc SConstruct
Simple merge