diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-22 15:29:44 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-22 15:29:44 -0400 |
| commit | 664e715a002450ac0f079411f6f051c122a4322a (patch) | |
| tree | 762f2a060843f77504ff39e2257ed4f32e6f83a1 /gtk2_ardour/rc_option_editor.cc | |
| parent | f86599cd74197ceb3e2e5cfe80a9a2dd5ee4201a (diff) | |
| parent | 61e66bb7631fc070a629d83e91855f58d7fb2489 (diff) | |
merge from master
Diffstat (limited to 'gtk2_ardour/rc_option_editor.cc')
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 7b8eb2ea20..da6d2344c2 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -1408,14 +1408,6 @@ RCOptionEditor::RCOptionEditor () add_option (_("Editor"), new BoolOption ( - "sync-all-route-ordering", - _("Synchronise editor and mixer track order"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_sync_all_route_ordering), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_sync_all_route_ordering) - )); - - add_option (_("Editor"), - new BoolOption ( "link-editor-and-mixer-selection", _("Synchronise editor and mixer selection"), sigc::mem_fun (*_rc_config, &RCConfiguration::get_link_editor_and_mixer_selection), @@ -1822,7 +1814,6 @@ RCOptionEditor::RCOptionEditor () rm->add (UserOrdered, _("assigned by user")); rm->add (MixerOrdered, _("follows order of mixer")); - rm->add (EditorOrdered, _("follows order of editor")); add_option (_("Control Surfaces"), rm); |