Merging r40572 through r40597 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 27 Sep 2011 09:26:46 +0000 (09:26 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 27 Sep 2011 09:26:46 +0000 (09:26 +0000)
14 files changed:
1  2 
CMakeLists.txt
release/scripts/modules/bpy_extras/keyconfig_utils.py
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_draw.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/transform/transform.c
source/creator/creator.c

diff --cc CMakeLists.txt
Simple merge
Simple merge