svn merge -r 31211:31313 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorJoerg Mueller <nexyon@gmail.com>
Fri, 13 Aug 2010 10:50:29 +0000 (10:50 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Fri, 13 Aug 2010 10:50:29 +0000 (10:50 +0000)
commit47d38dbd207bc5dcc5d0965fcf36ea37c366ba35
tree38ffad02c03ea80f3e22e8ef1108f54cc9a20d16
parentfd2a9a0ed07ee82a5409f09b864d8b0a900035aa
parent9ce2086506dcf16ecc0d5dce7851439ae8818e78
svn merge -r 31211:31313 https://svn.blender.org/svnroot/bf-blender/trunk/blender
release/scripts/op/console_python.py
source/blender/editors/space_logic/logic_window.c
source/blender/python/doc/sphinx_doc_gen.py
source/blender/python/generic/mathutils_matrix.c
source/gameengine/Ketsji/KX_PythonInit.cpp