Merge branch 'master' into gtk3

2016-12-18 17:49:03 +01:00
parent e1c5e76c10 e5dba2e890
commit 76314b9422
8 changed files with 6 additions and 15 deletions
--- a/rtgui/dirpyrequalizer.cc
+++ b/rtgui/dirpyrequalizer.cc
@@ -69,8 +69,6 @@ DirPyrEqualizer::DirPyrEqualizer () : FoldableToolPanel(this, "dirpyrequalizer",
    cbVBox->pack_start(*cdbox);
    pack_start(*cbVBox);

-    setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
-
    Gtk::HBox * buttonBox1 = Gtk::manage (new Gtk::HBox(true, 10));
    pack_start(*buttonBox1);