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)
commit23c38bc5e76531e594f1f2ad34ebfb723f43e1c5
treea5947af479d083147fc95e969f9388cf4ab328c6
parent9653234634b2ddc94efee212017e0381b759ae85
parent238d3fa4bbd63e58538b67ff00fd655fbebc8b49
svn merge ^/trunk/blender -r48168:48188
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