Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Thu, 13 Jul 2017 15:36:52 +0000 (17:36 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Thu, 13 Jul 2017 15:36:52 +0000 (17:36 +0200)
1  2 
source/blender/editors/space_sequencer/sequencer_edit.c