svn merge ^/trunk/blender -r50091:50107
authorCampbell Barton <ideasman42@gmail.com>
Wed, 22 Aug 2012 09:36:49 +0000 (09:36 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 22 Aug 2012 09:36:49 +0000 (09:36 +0000)
12 files changed:
1  2 
CMakeLists.txt
build_files/scons/config/win64-mingw-config.py
build_files/scons/tools/Blender.py
source/blender/blenkernel/intern/colortools.c
source/blender/blenkernel/intern/scene.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/render/intern/source/initrender.c
source/blender/render/intern/source/pipeline.c

diff --cc CMakeLists.txt
Simple merge
Simple merge