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)
commit5f902ed455eba978128e6a40903f1e1aaa1bbb19
treec7f8f86707ec514eb335d3bf8dff3f1630be7cae
parent6c500159d7786f201b0c21e0ec2bc0f3960f77d6
parent13254cde8c7ca38af2dcec35efdb9f8f9b3bca46
svn merge ^/trunk/blender -r50240:50244
source/blender/editors/space_sequencer/sequencer_edit.c