Merging r49815 through r49833 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 12 Aug 2012 10:07:55 +0000 (10:07 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 12 Aug 2012 10:07:55 +0000 (10:07 +0000)
commit8aeba8ec8b94d65d53f00b072f47812baa0c4c56
tree7eb1b6672aca06f457ac2c3ff6454595c83b8ae6
parent364f8cc1ead377c3fec28dbb379b2e14189ad0a8
parenta39329be5c8d4f0b293a98bb67a4720401c81e8d
Merging r49815 through r49833 from trunk into soc-2011-tomato
build_files/cmake/macros.cmake
build_files/scons/config/linux-config.py
build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-vc-config.py
build_files/scons/tools/Blender.py
build_files/scons/tools/btools.py
source/blender/editors/render/render_internal.c
source/blender/editors/space_image/image_ops.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_window.c