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

Simple merge
index 5147698927b2d53bd2543a660eca61afc2c34ac9,fb4aa4ca4a5c758086655115a01d81b7abe4ade0..a50b769ee11d983c01c9baeb82786d059cd53635
@@@ -66,8 -65,7 +66,8 @@@ set(SR
        intern/MOD_meshdeform.c
        intern/MOD_mirror.c
        intern/MOD_multires.c
-       intern/MOD_navmesh.cpp
 +      intern/MOD_ngoninterp.c
+       intern/MOD_navmesh.c
        intern/MOD_none.c
        intern/MOD_particleinstance.c
        intern/MOD_particlesystem.c
Simple merge