svn merge -r 12347:12382 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Wed, 24 Oct 2007 17:20:53 +0000 (17:20 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Wed, 24 Oct 2007 17:20:53 +0000 (17:20 +0000)
commit41b1505f83d39c83bae0444e1807758f2f695aff
tree8880b0bf0c8b824736d0bf1a46c6047eb51ca64f
parent916cd17778ef306c283adcdffe872c9503358ee0
parent30be716fc8e0ada286a94a53bf64dc5d16402c24
svn merge -r 12347:12382 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/include/butspace.h
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/editobject.c