merge with dev

2017-04-13 11:12:05 +02:00
parent 5b0d81667e 4893ece693
commit ce3351d50f
19 changed files with 568 additions and 239 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -309,6 +309,7 @@ public:
    Glib::ustring lastVibranceCurvesDir;
    Glib::ustring lastProfilingReferenceDir;
    Glib::ustring lastBWCurvesDir;
+    Glib::ustring lastLensProfileDir;

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