merge with dev

2019-09-06 10:56:03 +02:00
parent dfc4715a82 1eb4aac404
commit 202fb8084d
9 changed files with 31 additions and 23 deletions
--- a/rtgui/rtwindow.h
+++ b/rtgui/rtwindow.h
@@ -53,7 +53,6 @@ private:
    {
        return !options.tabbedUI && ! (options.multiDisplayMode > 0);
    };
-    void findVerNumbers (int* numbers, Glib::ustring versionStr);

    bool on_expose_event_epanel (GdkEventExpose* event);
    bool on_expose_event_fpanel (GdkEventExpose* event);