Merge branch 'stable-1.1'

Conflicts:
	data/locale/de.qm
	data/locale/de.ts
	src/gui/FxMixerView.cpp
This commit is contained in:
Vesa committed 2014-11-17 13:25:45 +02:00
commit dfb89c8c92
11 files changed
+367 -284

No files matched your search

+1
View File
@@ -128,6 +128,7 @@ EffectSelectDialog::EffectSelectDialog( QWidget * _parent ) :
EffectSelectDialog::~EffectSelectDialog()
{
delete ui;
}