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)
commit21e403e546398959fd3d7ce18c97091d9dae4538
tree92ade1dbee7421e771d9d03a4f6c4e77f278d4a6
parentc37a863ff4949ecb474e4f1e396cb52195515d7f
parentadec7cdea2ea3404577be1957e222ec42604c469
Merging r49953 through r50015 into from trunk into soc-2011-tomato
12 files changed:
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