svn merge -r 15529:15649 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Sun, 20 Jul 2008 08:52:48 +0000 (08:52 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Sun, 20 Jul 2008 08:52:48 +0000 (08:52 +0000)
commit037f1188e63c1b8b05d9421ee8f6395bcb3f1ab7
treec9476e0daa75e0e4dbd8cfc9035f851067d4ea29
parentb369936b1168984b37b04d4d78184ce59442de9e
parenta8785893c5657592c9cc27ce844664b5d62397de
svn merge -r 15529:15649 https://svn.blender.org/svnroot/bf-blender/trunk/blender
intern/elbeem/intern/controlparticles.cpp
intern/elbeem/intern/solver_init.cpp