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/editorpanel.h
+++ b/rtgui/editorpanel.h
@@ -138,7 +138,7 @@ protected:


 public:
-    EditorPanel (FilePanel* filePanel = NULL);
+    explicit EditorPanel (FilePanel* filePanel = NULL);
    virtual ~EditorPanel ();

    void open (Thumbnail* tmb, rtengine::InitialImage* isrc);