svn merge -r41266:41287 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Wed, 26 Oct 2011 03:26:52 +0000 (03:26 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 26 Oct 2011 03:26:52 +0000 (03:26 +0000)
1  2 
CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/mesh_validate.c
source/blender/editors/space_view3d/drawmesh.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt

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