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)
commit851682122504b8f4427c589485e79c9808630c2e
tree76483d108a16dcd39c7d0e6b0b228bf00e612edf
parent0d8a2456235e1233aa21bb4bfbe921345167501a
parentb218d901766305d322f1cadd4422c9efe2271495
svn merge ^/trunk/blender -r49638:49644
CMakeLists.txt