git.blender.org - blender-staging.git/commit

projects / blender-staging.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5b9a06e fb3ed9e)

author	Daniel Genrich <daniel.genrich@gmx.net>
	Wed, 2 Jan 2008 14:36:46 +0000 (14:36 +0000)
committer	Daniel Genrich <daniel.genrich@gmx.net>
	Wed, 2 Jan 2008 14:36:46 +0000 (14:36 +0000)
commit	a9c36825aa858823217f9873e2d29d0e0d102ec8
tree	90413ff0d52c7b7af0face11dc1573776c1d0c45	tree
parent	5b9a06e041240301d6ee527eaceea29704783346	commit \| diff
parent	fb3ed9e0a573d9296caddeba0f705b83949ee3ad	commit \| diff

svn merge -r 12937:13095 https://svn.blender.org/svnroot/bf-blender/trunk/blender

18 files changed:

SConstruct	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/softbody.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenloader/intern/readfile.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenloader/intern/writefile.c	diff1 \|	diff2 \|	blob \| history
source/blender/include/butspace.h	diff1 \|	diff2 \|	blob \| history
source/blender/src/blenderbuttons.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/buttons_editing.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/buttons_object.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/editmesh.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/editobject.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/editparticle.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/header_info.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/toets.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/toolbox.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/transform_conversions.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/transform_generics.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/vpaint.c	diff1 \|	diff2 \|	blob \| history
tools/btools.py	diff1 \|	diff2 \|	blob \| history

Repository to test new patches