Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2016-12-18 17:49:03 +01:00
8 changed files with 6 additions and 15 deletions

View File

@@ -25,8 +25,6 @@ using namespace rtengine::procparams;
Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENING_LABEL"), true, true)
{
setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ());
hb->show ();
Gtk::Label* ml = Gtk::manage (new Gtk::Label (M("TP_SHARPENING_METHOD") + ":"));