mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-02-25 02:38:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable-1.1'

Browse Source 
Conflicts:
	include/Effect.h
	include/Plugin.h
This commit is contained in:
Vesa
2014-11-25 21:23:57 +02:00
parent ed2cd2dda5 55c59a77bd
commit 33665a2848
56 changed files with 324 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp
View File

@@ -190,5 +190,5 @@ void SpectrumAnalyzerControlDialog::paintEvent( QPaintEvent * )
}
#include "moc_SpectrumAnalyzerControlDialog.cxx"