merged dev into locallab_dev

2017-05-03 14:15:52 +02:00
parent f2f45458be edfea689b8
commit 2492001c50
33 changed files with 1939 additions and 1700 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -337,7 +337,8 @@ public:
    {
        return globalProfilePath;
    }
-    Glib::ustring findProfilePath (Glib::ustring &profName);
+    Glib::ustring findProfilePath(Glib::ustring &profName);
+    bool        is_parse_extention (Glib::ustring fname);
    bool        has_retained_extention (Glib::ustring fname);
    bool        is_extention_enabled (Glib::ustring ext);
    bool        is_defProfRawMissing()