merge with dev

2019-12-21 06:35:28 +01:00
parent 2bf5c494c1 73655b6099
commit bd7f445de2
4 changed files with 138 additions and 3 deletions
--- a/rtgui/rtwindow.h
+++ b/rtgui/rtwindow.h
@@ -90,6 +90,7 @@ public:
    bool on_window_state_event (GdkEventWindowState* event) override;
    void on_mainNB_switch_page (Gtk::Widget* widget, guint page_num);

+    void showRawPedia();
    void showICCProfileCreator ();
    void showPreferences ();
    void on_realize () override;