merge with dev

2019-11-14 14:07:04 +01:00
parent d621721ffe c2ed31991b
commit c58d2a1d75
113 changed files with 700 additions and 368 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -215,10 +215,10 @@ struct CaptureSharpeningParamsEdited {
    bool contrast;
    bool autoContrast;
    bool autoRadius;
-    bool gamma;
    bool deconvradius;
    bool deconvradiusOffset;
    bool deconviter;
+    bool deconvitercheck;
    bool isUnchanged() const;
 };