Merge branch 'dev' into idle_harder

2017-03-30 21:44:31 +02:00
parent 6e1f7df2fb f0b7547cbb
commit f114b1151f
39 changed files with 1796 additions and 1425 deletions
--- a/rtgui/filebrowser.h
+++ b/rtgui/filebrowser.h
@@ -111,7 +111,7 @@ protected:
    Gtk::MenuItem* partpasteprof;
    Gtk::MenuItem* applyprof;
    Gtk::MenuItem* applypartprof;
-    Gtk::MenuItem* execcustprof;
+    Gtk::MenuItem* resetdefaultprof;
    Gtk::MenuItem* clearprof;
    Gtk::MenuItem* cachemenu;
    Gtk::MenuItem* clearFromCache;