svn merge -r37028:37030 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 31 May 2011 05:28:00 +0000 (05:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 31 May 2011 05:28:00 +0000 (05:28 +0000)
commit8949387186ef59bd0ba28cfe0c0e14a3ab5ac2d6
treee5746dba9292c4383730b092d09536247516bb5a
parent08d6932c860e7f2926e3980764fc5e11a821d0a3
parent09da9d43931a09e3786343e724a3de7217285d0d
svn merge -r37028:37030 https://svn.blender.org/svnroot/bf-blender/trunk/blender
18 files changed:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/CMakeLists.txt
source/blender/bmesh/CMakeLists.txt
source/blender/editors/mesh/CMakeLists.txt
source/blender/editors/object/CMakeLists.txt
source/blender/editors/render/CMakeLists.txt
source/blender/editors/screen/CMakeLists.txt
source/blender/editors/space_api/CMakeLists.txt
source/blender/editors/space_image/CMakeLists.txt
source/blender/editors/space_info/CMakeLists.txt
source/blender/editors/space_view3d/CMakeLists.txt
source/blender/editors/transform/CMakeLists.txt
source/blender/editors/util/CMakeLists.txt
source/blender/editors/uvedit/CMakeLists.txt
source/blender/makesrna/intern/CMakeLists.txt
source/blender/modifiers/CMakeLists.txt
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/SConscript