merge with dev

2017-08-09 07:57:19 +02:00
parent ff5b537c5c 6976a75537
commit 234710ae9a
50 changed files with 751 additions and 499 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -320,6 +320,7 @@ public:
    Glib::ustring lastProfilingReferenceDir;
    Glib::ustring lastBWCurvesDir;
    Glib::ustring lastLensProfileDir;
+    bool gimpPluginShowInfoDialog;

    size_t maxRecentFolders;                   // max. number of recent folders stored in options file
    std::vector<Glib::ustring> recentFolders;  // List containing all recent folders