svn merge -r 30323:30417 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorJoerg Mueller <nexyon@gmail.com>
Fri, 16 Jul 2010 17:43:08 +0000 (17:43 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Fri, 16 Jul 2010 17:43:08 +0000 (17:43 +0000)
commit2ffe3e46c5448385ed744e3a237c52ccc80a6dc3
treee25471948d9273ca9cd8eab0813ffb44a16e2be0
parent8b8b4f332459018a6336675886a004d4f79980a9
parent6a880daa92487b7f18653c32fcfcbad11ead6b75
svn merge -r 30323:30417 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/python/intern/bpy.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/creator.c