svn merge -r 13095:13148 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Mon, 7 Jan 2008 03:25:11 +0000 (03:25 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Mon, 7 Jan 2008 03:25:11 +0000 (03:25 +0000)
commit86d8ef3f9125b4439b5231a756cee5cb89e3f270
treecb9f5625fc94257ac14ebd65f0cdcd7bdf729016
parent8d6bbf763504af934a859573ba45880159bc1828
parente6ee8c7d49a66d2adab634047631819050d5e8b9
svn merge -r 13095:13148 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenloader/intern/readfile.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/editparticle.c
source/blender/src/transform_conversions.c