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

@@ -67,3 +67,5 @@ AmplifierControlDialog::AmplifierControlDialog( AmplifierControls* controls ) :
rightKnob->setLabel( tr( "RIGHT" ) );
rightKnob->setHintText( tr( "Right gain:" ) + " ", "%" );
}
#include "moc_AmplifierControlDialog.cxx"