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)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge