Merge with blender svn -> svn merge -r 12064:12150 https://svn.blender.org/svnroot...
authorDaniel Genrich <daniel.genrich@gmx.net>
Wed, 26 Sep 2007 10:28:30 +0000 (10:28 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Wed, 26 Sep 2007 10:28:30 +0000 (10:28 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/editmesh.c
source/blender/src/editobject.c
source/blender/src/transform_conversions.c
source/blender/src/transform_generics.c

Simple merge
Simple merge
Simple merge
Simple merge