svn merge ^/trunk/blender -r40395:40405
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 10:58:20 +0000 (10:58 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 10:58:20 +0000 (10:58 +0000)
commit161c3861bc09d3e666d4c73d35da85e024fe779f
tree4bcb6ce4b9fc7820690f2e2330093d8168f2ba6f
parent460cde345bd7779f7dc011b7154c7497be46d799
parent9d1b4b63b33b77505f4399a4db4f462f5b1fd1eb
svn merge ^/trunk/blender -r40395:40405
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/SConscript
source/blender/windowmanager/intern/wm_init_exit.c