Skip to content
Commit 5fcf17f2 authored by Vincent PINON's avatar Vincent PINON
Browse files

merge command files 

Conflicts:
	src/clipmanager.cpp
	src/commands/CMakeLists.txt
	src/customtrackview.cpp
parent aad6b144
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