svn merge ^/trunk/blender -r48168:48188
authorCampbell Barton <ideasman42@gmail.com>
Fri, 22 Jun 2012 11:56:21 +0000 (11:56 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 22 Jun 2012 11:56:21 +0000 (11:56 +0000)
1  2 
CMakeLists.txt
build_files/scons/config/win32-mingw-config.py
build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-mingw-config.py
build_files/scons/config/win64-vc-config.py

diff --cc CMakeLists.txt
Simple merge