svn merge ^/trunk/blender -r50143:50146
authorCampbell Barton <ideasman42@gmail.com>
Thu, 23 Aug 2012 08:54:06 +0000 (08:54 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 23 Aug 2012 08:54:06 +0000 (08:54 +0000)
1  2 
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_sequencer/sequencer_edit.c