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)
1  2 
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt

Simple merge