Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / rc_option_editor.cc

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index ed9ffda4efc221cb7c22ca506fad0a5c020b17d3..04b3b5a8c2a134426f8b8cb88d4a49fe5c2bf53b 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -1398,14 +1398,6 @@ RCOptionEditor::RCOptionEditor ()
                            sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_zoom_tools)
                            ));
 
-       add_option (_("Editor"),
-                   new BoolOption (
-                           "color-regions-using-track-color",
-                           _("Color regions using their track's color"),
-                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_color_regions_using_track_color),
-                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_color_regions_using_track_color)
-                           ));
-
        add_option (_("Editor"),
                    new BoolOption (
                            "update-editor-during-summary-drag",