svn merge ^/trunk/blender -r41227:41230 . --accept=theirs-full
authorCampbell Barton <ideasman42@gmail.com>
Mon, 24 Oct 2011 22:18:32 +0000 (22:18 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 24 Oct 2011 22:18:32 +0000 (22:18 +0000)
1  2 
build_files/cmake/cmake_consistency_check.py
build_files/cmake/project_info.py
build_files/cmake/project_source_info.py

Simple merge