Merge with trunk r41411
authorMiika Hamalainen <blender@miikah.org>
Mon, 31 Oct 2011 13:18:14 +0000 (13:18 +0000)
committerMiika Hamalainen <blender@miikah.org>
Mon, 31 Oct 2011 13:18:14 +0000 (13:18 +0000)
commitcd338a4130011ed9eccc7b131b11e4261b9dc269
tree767bb3edaa08fef0bb6ff039fced376f9a00e9c3
parent0a37e6ab976344818483df899b4fc44aedb30613
parenta664e779ac8be0f926221d4c064394f9b3b6a801
Merge with trunk r41411
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/physics/CMakeLists.txt
source/blender/makesrna/intern/CMakeLists.txt
source/blender/modifiers/CMakeLists.txt