Merging r49834 through r49839 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 12 Aug 2012 13:38:46 +0000 (13:38 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 12 Aug 2012 13:38:46 +0000 (13:38 +0000)
commit8d59fa4e407ed0c4cf82ef4eda5c7d0d7e94df64
treea762d5b34073355622bb837f7b77786d36005ebd
parentb37fae861175f2fcdae8c57abfc417801b803b69
parent82688e61fc330022bd8685a5a137fca024a60b8a
Merging r49834 through r49839 from trunk into soc-2011-tomato
release/scripts/startup/bl_ui/space_sequencer.py
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c