mirror/lmms
1
0 Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-10-20 22:04:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into rename

Browse Source 
Conflicts:
	src/core/Song.cpp
	src/gui/LfoControllerDialog.cpp
	src/tracks/InstrumentTrack.cpp
This commit is contained in:
Lukas W committed 2014-11-26 11:45:55 +01:00
2 parents 3f172c5a4c ed11ccbf50
commit 5f4cdac802
59 files changed
+372 -203
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp
-2
View File
@@ -190,5 +190,3 @@ void SpectrumAnalyzerControlDialog::paintEvent( QPaintEvent * )
}