svn merge ^/trunk/blender -r49638:49644
authorCampbell Barton <ideasman42@gmail.com>
Tue, 7 Aug 2012 10:06:31 +0000 (10:06 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 7 Aug 2012 10:06:31 +0000 (10:06 +0000)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge