Merge branch 'stable-1.1'

Conflicts: src/core/AutomatableModel.cpp
2014-06-23 22:10:27 +03:00
parent eee2ba7f16 1287aec800
commit 4185eac023
9 changed files with 123 additions and 67 deletions
--- a/plugins/LadspaEffect/LadspaControlDialog.h
+++ b/plugins/LadspaEffect/LadspaControlDialog.h
@@ -24,8 +24,8 @@
 *
 */

-#ifndef _LADSPA_CONTROL_DIALOG_H
-#define _LADSPA_CONTROL_DIALOG_H
+#ifndef LADSPA_CONTROL_DIALOG_H
+#define LADSPA_CONTROL_DIALOG_H

 #include "EffectControlDialog.h"

--- a/plugins/LadspaEffect/LadspaControls.h
+++ b/plugins/LadspaEffect/LadspaControls.h
@@ -22,8 +22,8 @@
 *
 */

-#ifndef _LADSPA_CONTROLS_H
-#define _LADSPA_CONTROLS_H
+#ifndef LADSPA_CONTROLS_H
+#define LADSPA_CONTROLS_H

 #include "EffectControls.h"
 #include "LadspaControl.h"