svn merge ^/trunk/blender -r44204:44213
authorCampbell Barton <ideasman42@gmail.com>
Fri, 17 Feb 2012 21:07:18 +0000 (21:07 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 17 Feb 2012 21:07:18 +0000 (21:07 +0000)
commit379527581b51274d0624b72fddd016679ff2f4a3
treed5d7726144ace01fce50ddc32cbdc8033b815457
parent48006292d8b3c6c8dd4bfe87bdbe271db93cffff
parentc628f04a7c39bcd178d06448f9ca5e9324141f50
svn merge ^/trunk/blender -r44204:44213
CMakeLists.txt
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt