diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-14 10:56:17 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-14 10:56:17 -0500 |
commit | cf806123ca5faaef483f898daba3f7bd38ec62eb (patch) | |
tree | f11f2f9ff64ea3b3682c81b8dd893ba0e9476445 /libs/ardour/ardour/rc_configuration_vars.h | |
parent | cfc9a1f22ea38d4dd6c619d6cec25fe29b1c2f48 (diff) | |
parent | d9296b71237d9d3058b0796eda25258fadd45ad9 (diff) |
merge (with conflict fixes) with master (even against rgareus' recommendation)
Diffstat (limited to 'libs/ardour/ardour/rc_configuration_vars.h')
-rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index 23973f6a1a..adae854ca7 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -113,6 +113,8 @@ CONFIG_VARIABLE (gain_t, solo_mute_gain, "solo-mute-gain", 0.0) CONFIG_VARIABLE (std::string, monitor_bus_preferred_bundle, "monitor-bus-preferred-bundle", "") CONFIG_VARIABLE (bool, quieten_at_speed, "quieten-at-speed", true) +CONFIG_VARIABLE (bool, link_send_and_route_panner, "link-send-and-route-panner", true) + /* click */ CONFIG_VARIABLE (bool, clicking, "clicking", false) |