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

 public:

-    ZoomPanel (ImageArea* iarea);
+    explicit ZoomPanel (ImageArea* iarea);

    void zoomInClicked      ();
    void zoomOutClicked     ();