Skip to content
Commit 69b1c53d authored by Till Theato's avatar Till Theato
Browse files

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
parents 34f38ea1 27042c59
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment