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)
commit5ea86e1e2b09b58a72992083f79c03ee3f20af49
tree79d682900c73c4a87aa90a8d9dbd293c4396013e
parentdd2b4a05c3dc527bc0c459f81f5810e6ecb151a6
parent758c2282635f77ee1317d4bdbdf1959bf0c09525
svn merge ^/trunk/blender -r43995:44024
CMakeLists.txt
source/blender/modifiers/CMakeLists.txt