Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 5 Sep 2018 02:14:53 +0000 (12:14 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 5 Sep 2018 02:14:53 +0000 (12:14 +1000)
1  2 
source/blender/editors/space_sequencer/sequencer_edit.c