svn merge -r41335:41371
authorCampbell Barton <ideasman42@gmail.com>
Sun, 30 Oct 2011 01:27:49 +0000 (01:27 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 30 Oct 2011 01:27:49 +0000 (01:27 +0000)
commitbd86ba2c88aa912eefb38dc4a809f1ca1e49a31f
treeb2464a5cc64089772d52c5e9e740a73210d60e6d
parente48d7f4c111ea61eec467e972be1005f953768b1
parentf837b46a2b561293660a0edf9d4de5ff16922f42
svn merge -r41335:41371
CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenloader/intern/writefile.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_ui_api.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/SConscript
source/blender/modifiers/intern/MOD_fluidsim_util.c