mirror/lmms
1
0 Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-10-27 17:19:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ed_refac

Browse Source 
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
This commit is contained in:
Lukas W committed 2015-01-06 23:05:13 +01:00
2 parents 068066929f 814aba053e
commit 23e0e0fb8e
124 files changed
+3809 -694
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

plugins/delay/delaycontrolsdialog.cpp
-1
View File
@@ -71,4 +71,3 @@ DelayControlsDialog::DelayControlsDialog( DelayControls *controls ) :
}
#include "moc_delaycontrols.cxx"