svn merge -r 13323:13357 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Tue, 22 Jan 2008 20:35:37 +0000 (20:35 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Tue, 22 Jan 2008 20:35:37 +0000 (20:35 +0000)
commitd623e52afd39627b1f410f35c42079d9380d7d72
tree3787503526b3c274430de92e931e9a28830c1bec
parent35c93b07bd18590b4b80acc8c8a6adf1d6f122c1
parent0ea3c91a784c3fead61158c32a1cab3609de886d
svn merge -r 13323:13357 https://svn.blender.org/svnroot/bf-blender/trunk/blender
CMakeLists.txt
source/Makefile
source/blender/blenkernel/BKE_collision.h
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/toolbox.c