Merge branch 'master' into softproofing

2016-10-16 01:45:52 +02:00
parent 81c5b1ca41 29d5329f3f
commit 50165dab20
159 changed files with 15819 additions and 2723 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -784,7 +784,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);