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)
commitb64eeda5889f239ab9eb3e262b65fb2090650f33
treef989297146c673e3a526d2066d0e62d822b3671f
parent4d8b5587b867e53c22b4f3f3c56ba8714e9b7bfb
parentb65d4f95fc6ff35d93dc1f8bbc07f10b7e15ea2c
svn merge -r 14810:14838 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/intern/particle_system.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c