svn merge -r 13177:13240 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Tue, 15 Jan 2008 13:00:29 +0000 (13:00 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Tue, 15 Jan 2008 13:00:29 +0000 (13:00 +0000)
commit2d06f79ff99b79708bc33870a2565718c92ae9f8
treece0ff6d5d08eaa912061e2e901cdb8b0c368eb53
parent43cd8a9f71da3e0d1a78a5c1e089afd464862a42
parent28667a314e94da91de6121894dfd237217da0b80
svn merge -r 13177:13240 https://svn.blender.org/svnroot/bf-blender/trunk/blender
12 files changed:
source/blender/blenkernel/intern/Makefile
source/blender/blenkernel/intern/softbody.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/include/butspace.h
source/blender/makesdna/DNA_object_force.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/header_info.c
source/blender/src/transform_conversions.c
source/blender/src/usiblender.c