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)
commitea36d4eb228ded32f6e7a0ed10fcfa9d18848282
treea79c7e5e541879172e6a9a85bf1c281d9e2a29d2
parentcb8090d4c816875580a485a6c7f5ec900030cd56
parent85a97f64a7cbc5f17594a22ce1431520d2ff4d59
svn merge ^/trunk/blender -r42953:42957
source/blender/blenlib/CMakeLists.txt