Merge branch 'refactoring' of git://anongit.kde.org/kdenlive into refactoring
Conflicts: src/core/bin/bin.cpp src/core/bin/bin.h src/core/project/abstractprojectitem.h
Please register or sign in to comment
Conflicts: src/core/bin/bin.cpp src/core/bin/bin.h src/core/project/abstractprojectitem.h