diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
| commit | ee1b49f87e4b8e6406c059f29371892872d3fb85 (patch) | |
| tree | 107f163d9f707c97a0b8179a5f2afd9995d616ec /libs/ardour/ardour/rc_configuration_vars.h | |
| parent | 8cd71108c1d153f84f25c3b9e5153a110826c130 (diff) | |
| parent | 1421a34e52862b614f280c751a12893e4abecf88 (diff) | |
fix merge conflicts from master
Diffstat (limited to 'libs/ardour/ardour/rc_configuration_vars.h')
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index a1008df6a6..e05efbd510 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -154,6 +154,7 @@ CONFIG_VARIABLE (MeterLineUp, meter_line_up_level, "meter-line-up-level", Meteri CONFIG_VARIABLE (MeterLineUp, meter_line_up_din, "meter-line-up-din", MeteringLineUp15) CONFIG_VARIABLE (float, meter_peak, "meter-peak", 0.0f) CONFIG_VARIABLE (bool, meter_style_led, "meter-style-led", true) +CONFIG_VARIABLE (bool, show_editor_meter, "show-editor-meter", true) /* miscellany */ |