merge with dev

2018-10-27 16:11:17 +02:00
parent 59339644de eee6837385
commit b50b8dea9f
211 changed files with 2968 additions and 1991 deletions
--- a/rtgui/dehaze.h
+++ b/rtgui/dehaze.h
@@ -48,5 +48,6 @@ public:
    void enabledChanged();
    void showDepthMapChanged();
    void setAdjusterBehavior(bool strengthAdd);
+    void adjusterAutoToggled(Adjuster* a, bool newval) {}
 };