svn merge -r 13382:13415 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Sat, 26 Jan 2008 21:54:09 +0000 (21:54 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Sat, 26 Jan 2008 21:54:09 +0000 (21:54 +0000)
commit1f0e182f351cf5bbf1226aef3385081348bea6bc
tree55e5e224dd73409fd09a77b9fba3a28f3bbb260c
parenta1a9e011b8d1f545a5db3144b22b48a7a4df2786
parentbda73e2f353267dc3d7ba16dcebacbc80b937ed7
svn merge -r 13382:13415 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenloader/intern/readfile.c
source/blender/include/butspace.h
source/blender/src/buttons_object.c
source/blender/src/editobject.c