Merging r39312 through r39329 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 12 Aug 2011 14:39:04 +0000 (14:39 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 12 Aug 2011 14:39:04 +0000 (14:39 +0000)
commite14e46874614cb4ed933ff1b4ab471607a7c7190
treeeed390e112031ba7fef81c65e13f8bab709ecf63
parent34ce85571f4feff59efad91ebd72e4aa942bae60
parentb374ab919a4b46d377d88ad0f1f1eced06621eca
Merging r39312 through r39329 from trunk into soc-2011-tomato
13 files changed:
release/scripts/startup/bl_operators/presets.py
release/scripts/startup/bl_ui/properties_data_camera.py
release/scripts/startup/bl_ui/properties_object_constraint.py
release/scripts/startup/bl_ui/properties_scene.py
release/scripts/startup/bl_ui/space_sequencer.py
release/scripts/startup/bl_ui/space_time.py
release/scripts/startup/bl_ui/space_userpref_keymap.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/sequencer_intern.h
source/blender/editors/space_sequencer/sequencer_ops.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_operators.c