Merge branch 'master' into gtk3

2017-01-06 20:12:12 +01:00
parent d8f5161ba5 a7b670dc27
commit 934f1b1513
38 changed files with 1117 additions and 968 deletions
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -803,7 +803,6 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
    prtBPC->set_active (true);

    row = 0;
-    gprinter->attach (*pplabel, 0, row, 1, 1);
    gprinter->attach (*prtProfile, 1, row, 1, 1);
    ++row;
    gprinter->attach (*pilabel, 0, row, 1, 1);