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/splash.h
+++ b/rtgui/splash.h
@@ -44,7 +44,7 @@ private:

 public:
    Splash (Gtk::Window& parent, int maxtime);
-    Splash (Gtk::Window& parent);
+    explicit Splash (Gtk::Window& parent);

    bool hasReleaseNotes()
    {