Merge branch 'master' into 'gtk3'

2016-03-05 09:21:34 +01:00
parent 830c58877f 72283f867d
commit a04c7706db
119 changed files with 3006 additions and 3007 deletions
--- a/rtgui/filebrowser.h
+++ b/rtgui/filebrowser.h
@@ -93,7 +93,7 @@ protected:
    Gtk::MenuItem* menuExtProg;
    Gtk::MenuItem** amiExtProg;
    Gtk::MenuItem* miOpenDefaultViewer;
-    std::map<Glib::ustring, ExtProgAction*> mMenuExtProgs;  // key is menuitem label
+    std::map<Glib::ustring, const ExtProgAction*> mMenuExtProgs;  // key is menuitem label

    Gtk::MenuItem* menuDF;
    Gtk::MenuItem* selectDF;