Commit: 496b510438b2f994cafcec6e36fe300be9fe015f
Author: Bastien Montagne
Date:   Thu Aug 10 15:43:52 2017 +0200
Branches: id_copy_refactor
https://developer.blender.org/rB496b510438b2f994cafcec6e36fe300be9fe015f

Merge branch 'master' into id_copy_refactor

Conflicts:
        source/blender/blenkernel/BKE_sequencer.h
        source/blender/blenkernel/intern/library.c
        source/blender/blenkernel/intern/sequencer.c
        source/blender/editors/space_sequencer/sequencer_edit.c

===================================================================



===================================================================



_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to