svn merge ^/trunk/blender -r42953:42957
authorCampbell Barton <ideasman42@gmail.com>
Thu, 29 Dec 2011 01:58:47 +0000 (01:58 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 29 Dec 2011 01:58:47 +0000 (01:58 +0000)
1  2 
source/blender/blenlib/CMakeLists.txt

Simple merge