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)
commit31ad03dbdedf9361739e8b7ff3f8843f9f91db46
tree4160a7b83c9b8e9e5f5eaea8aeca06b35e3795e6
parentf8f90e1312d07a3ad6c0677e0571bbb3d4855fc1
parenta651f5da66c024acf7142a24f1a33a8ecb9d7f0c
Merge branch 'master' into blender2.8
source/blender/editors/space_sequencer/sequencer_edit.c