Merge branch 'stable-1.1'
Conflicts: include/Effect.h include/Plugin.h
This commit is contained in:
commit
33665a2848
56 files changed
+324
-179
No files matched your search
@@ -190,5 +190,5 @@ void SpectrumAnalyzerControlDialog::paintEvent( QPaintEvent * )
|
||||
|
||||
}
|
||||
|
||||
|
||||
#include "moc_SpectrumAnalyzerControlDialog.cxx"
|
||||
|
||||
Reference in new issue
Block a user