merge with dev

2017-09-15 08:46:19 +02:00
parent 9786ec0687 952ada554a
commit 99353cae14
8 changed files with 42 additions and 7 deletions
--- a/rtengine/settings.h
+++ b/rtengine/settings.h
@@ -100,6 +100,8 @@ public:
    double          reduclow;


+    Glib::ustring   lensfunDbDirectory; ///< The directory containing the lensfun database. If empty, the system defaults will be used (as described in http://lensfun.sourceforge.net/manual/dbsearch.html)
+    
    /** Creates a new instance of Settings.
      * @return a pointer to the new Settings instance. */
    static Settings* create  ();