svn merge -r 13415:13452 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Tue, 29 Jan 2008 16:42:57 +0000 (16:42 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Tue, 29 Jan 2008 16:42:57 +0000 (16:42 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/drawobject.c
source/blender/src/editobject.c
source/blender/src/transform_conversions.c

Simple merge
Simple merge
Simple merge
Simple merge