Merge branch 'blender2.7'
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 11 Jan 2019 19:03:42 +0000 (20:03 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 11 Jan 2019 19:03:42 +0000 (20:03 +0100)
commitee34275e7da798a1cc9c398ac9bba68ad3343c1b
treef039058be6f8f4aa41cdde2a8540430d8f0f4df3
parentbb9c9d0eaaab836b8f20ab7b2228795f607b823a
parent1ded3d2f7c04100698afdee356e2ba8d4ae2d6bd
Merge branch 'blender2.7'
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/space_sequencer/sequencer_edit.c