svn merge ^/trunk/blender -r43995:44024
authorCampbell Barton <ideasman42@gmail.com>
Sat, 11 Feb 2012 04:10:50 +0000 (04:10 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 11 Feb 2012 04:10:50 +0000 (04:10 +0000)
1  2 
CMakeLists.txt
source/blender/modifiers/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge