svn merge ^/trunk/blender -r41939:41954
authorCampbell Barton <ideasman42@gmail.com>
Fri, 18 Nov 2011 05:06:53 +0000 (05:06 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 18 Nov 2011 05:06:53 +0000 (05:06 +0000)
commit5600d214f1f2f05e98fd6f4d5f86bdff01e8b3f8
treedc35ebf81c9d424e9136e754d71e86146273d9d2
parent8a8566c8949f851cda3644073d1bff60b43b5abd
parentc6c6a3578beae28a6c6c0164757ebbb694e7f816
svn merge ^/trunk/blender -r41939:41954
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt