Merge with trunk: svn merge -r 12182:12207 https://svn.blender.org/svnroot/bf-blender...
authorDaniel Genrich <daniel.genrich@gmx.net>
Thu, 4 Oct 2007 11:22:54 +0000 (11:22 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Thu, 4 Oct 2007 11:22:54 +0000 (11:22 +0000)
commit0efce1fa795e2f6c75ff25b88b3aff785ad71ca6
treeb54240fb68d5265da7fd4067a5a4e74cb0518d02
parent626edd8de8c3ce237c0ece95f99fb56f1b90bbe8
parenta41da4fe110410394b964400bb1b5f49fa569f3b
Merge ... trunk: svn merge -r 12182:12207 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/intern/collision.c
source/blender/blenloader/intern/readfile.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c