mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-02-25 10:48:07 -05: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
2014-11-26 11:45:55 +01:00
parent 3f172c5a4c ed11ccbf50
commit 5f4cdac802
59 changed files with 372 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp
View File

@@ -190,5 +190,3 @@ void SpectrumAnalyzerControlDialog::paintEvent( QPaintEvent * )
}