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/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -782,7 +782,7 @@ public:
    bool                          exif;
    bool                          iptc;

-    ParamsEdited (bool value = false);
+    explicit ParamsEdited (bool value = false);

    void set   (bool v);
    void initFrom (const std::vector<rtengine::procparams::ProcParams>& src);