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)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/include/butspace.h
source/blender/src/buttons_object.c
source/blender/src/editobject.c

Simple merge
Simple merge
Simple merge