merge with dev

2018-01-22 12:58:28 +01:00
parent cef451807d dbe3d55e33
commit 9f0b5dc844
3 changed files with 0 additions and 18 deletions
--- a/rtengine/settings.h
+++ b/rtengine/settings.h
@@ -90,8 +90,6 @@ public:
    double          ed_detec;
    double          ed_detecStr;
    double          ed_low;
-    double          ed_lipinfl;
-    double          ed_lipampl;

    int             nspot;
    bool            locdelay;