Merging r49953 through r50015 into from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 19 Aug 2012 13:57:55 +0000 (13:57 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 19 Aug 2012 13:57:55 +0000 (13:57 +0000)
12 files changed:
1  2 
CMakeLists.txt
intern/CMakeLists.txt
release/scripts/startup/bl_ui/space_sequencer.py
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_image/image_buttons.c
source/blender/imbuf/IMB_imbuf_types.h
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge
Simple merge