Lukas W 23e0e0fb8e Merge branch 'master' into ed_refac ...

Conflicts:
	include/AutomationEditor.h
	include/SongEditor.h
	plugins/delay/delaycontrols.cpp
	plugins/delay/delaycontrolsdialog.cpp
	src/gui/editors/AutomationEditor.cpp
	src/gui/editors/BBEditor.cpp
	src/gui/editors/PianoRoll.cpp

2015-01-06 23:05:13 +01:00

2.5 KiB

Raw Blame History

View Raw