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)
1  2 
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

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge