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/addsetids.h
+++ b/rtgui/addsetids.h
@@ -143,7 +143,6 @@ enum {
    ADDSET_XTRANS_FALSE_COLOR_SUPPRESSION,
    ADDSET_SOFTLIGHT_STRENGTH,
    ADDSET_DEHAZE_STRENGTH,
-    ADDSET_SHARP_GAMMA,

    ADDSET_PARAM_NUM // THIS IS USED AS A DELIMITER!!
 };