svn merge ^/trunk/blender -r49644:49653
authorCampbell Barton <ideasman42@gmail.com>
Tue, 7 Aug 2012 13:38:35 +0000 (13:38 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 7 Aug 2012 13:38:35 +0000 (13:38 +0000)
commit9ad19c26ca5e4e3dcc061dff70924bedf0167e4f
tree19028072160b1cd513435c10daf6725f7020f36d
parentb364f6e6929febb94e7de4891293a4042f7ac62f
parent719aedaf60ecbf2108117d9377acb2f1614cc7cd
svn merge ^/trunk/blender -r49644:49653
CMakeLists.txt