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

projects / blender-staging.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: db57ad6 7da56f4)

author	Daniel Genrich <daniel.genrich@gmx.net>
	Mon, 26 Nov 2007 23:11:07 +0000 (23:11 +0000)
committer	Daniel Genrich <daniel.genrich@gmx.net>
	Mon, 26 Nov 2007 23:11:07 +0000 (23:11 +0000)
commit	41745b8a506866f301c2e68cc36628f2b68a1581
tree	e4c2a40d4d3ab4acf216a4ef648a124dd1f3fc96	tree
parent	db57ad68cd864e7d2df4f33372e35fb3d348e272	commit \| diff
parent	7da56f4a9ba0bdd0cdcd40b8ca6e69d776d26abe	commit \| diff

Particle merge: svn merge -r 12653:12664 https://svn.blender.org/svnroot/bf-blender/trunk/blender

16 files changed:

source/blender/blenkernel/BKE_cloth.h	diff1 \|	\|	blob \| history
source/blender/blenkernel/BKE_modifier.h	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/BKE_pointcache.h	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/cloth.c	diff1 \|	\|	blob \| history
source/blender/blenkernel/intern/modifier.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/makesdna/DNA_modifier_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_object_force.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/intern/makesdna.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/editobject.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

Repository to test new patches