Merge master into gtk3

2016-10-28 17:59:47 +02:00
parent 5244c44420 3a346d919d
commit b16ef8d1f5
259 changed files with 5061 additions and 3654 deletions
--- a/rtgui/splash.h
+++ b/rtgui/splash.h
@@ -48,7 +48,7 @@ public:

    bool hasReleaseNotes()
    {
-        return releaseNotesSW != NULL;
+        return releaseNotesSW != nullptr;
    };
    void showReleaseNotes();
    bool on_timer ();