merge with dev

2017-09-14 09:09:18 +02:00
parent 7bbecdf50c 7d8de8b020
commit 9786ec0687
40 changed files with 2861 additions and 1388 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -525,6 +525,7 @@ class LensProfParamsEdited
 {
 public:
    bool lcpFile, useDist, useVign, useCA;
+    bool useLensfun, lfAutoMatch, lfCameraMake, lfCameraModel, lfLens;

    bool isUnchanged() const;
 };