svn merge -r 12691:12716 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Thu, 29 Nov 2007 12:40:53 +0000 (12:40 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Thu, 29 Nov 2007 12:40:53 +0000 (12:40 +0000)
commite9c9bf5bdb73a80d36d7250594a1e4d4b397b755
tree6c33268369eeeb0c1787e919847c9324d1e2a86d
parent543f38c20a10f08eb11391b99c00ff6bf2add3d9
parent742ef6746c3bd1dfbc2ecd705d4af255e919d7ae
svn merge -r 12691:12716 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenloader/intern/readfile.c
source/blender/include/butspace.h
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/editobject.c
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
tools/btools.py