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)
commit66617d1b131dd51ca845cccb4453f85109b9e355
treeff609bd2f929438875bfab0f24fb2b10af098ba9
parent9e79af949bd1e71910b598c0e4b995209854adc5
parentfbbd64a118cb4f1bf96029599ed3ec9d91734d6b
svn merge ^/trunk/blender -r47961:48070
source/blender/windowmanager/CMakeLists.txt
source/creator/CMakeLists.txt