svn merge -r 12294:12347 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Mon, 22 Oct 2007 23:05:09 +0000 (23:05 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Mon, 22 Oct 2007 23:05:09 +0000 (23:05 +0000)
commit0a0b976b41fe952ced55eaa6dabf133c7fe0808d
tree3b42e6ac66162b5f1d5d6deca7566ad473be1048
parent5a6ffd8441a092906bc445f7084d585624a7367b
parent03650fcf0b41052c94cb1b4b14dfd31407a6ac63
svn merge -r 12294:12347 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/Makefile
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/include/butspace.h
source/blender/makesdna/intern/makesdna.c
source/blender/src/buttons_object.c
source/blender/src/editobject.c