Merge branch 'stable-1.1'

Conflicts:
	include/Effect.h
	include/Plugin.h
This commit is contained in:
Vesa committed 2014-11-25 21:23:57 +02:00
commit 33665a2848
56 files changed
+324 -179

No files matched your search

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