svn merge ^/trunk/blender -r47961:48070
authorCampbell Barton <ideasman42@gmail.com>
Tue, 19 Jun 2012 08:16:07 +0000 (08:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 19 Jun 2012 08:16:07 +0000 (08:16 +0000)
1  2 
source/blender/windowmanager/CMakeLists.txt
source/creator/CMakeLists.txt

Simple merge