svn merge ^/trunk/blender -r50240:50244
authorCampbell Barton <ideasman42@gmail.com>
Mon, 27 Aug 2012 09:46:49 +0000 (09:46 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 27 Aug 2012 09:46:49 +0000 (09:46 +0000)
1  2 
source/blender/editors/space_sequencer/sequencer_edit.c