Merge branch 'master' into gtk3-merge-master-b8eb349

2016-10-10 23:07:41 +02:00
parent d16d244fc5 b8eb3492c9
commit 0dbea030cb
166 changed files with 15898 additions and 2285 deletions
--- a/rtgui/curveeditorgroup.h
+++ b/rtgui/curveeditorgroup.h
@@ -155,7 +155,7 @@ protected:
     *                 This variable will be updated with actions in the
     *                 dialogs.
     */
-    CurveEditorSubGroup(Glib::ustring& curveDir);
+    explicit CurveEditorSubGroup(Glib::ustring& curveDir);

    Glib::ustring outputFile ();
    Glib::ustring inputFile ();