svn merge -r 14810:14838 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Wed, 14 May 2008 16:14:40 +0000 (16:14 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Wed, 14 May 2008 16:14:40 +0000 (16:14 +0000)
1  2 
source/blender/blenkernel/intern/particle_system.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c

Simple merge
Simple merge