merge with dev

2019-07-24 10:45:52 +02:00
parent ad6c0d04a7 c5e9482a29
commit beab5c5254
131 changed files with 452 additions and 976 deletions
--- a/rtgui/whitebalance.h
+++ b/rtgui/whitebalance.h
@@ -110,7 +110,6 @@ public:
    void spotPressed ();
    void spotSizeChanged ();
    void adjusterChanged(Adjuster* a, double newval) override;
-    void adjusterAutoToggled(Adjuster* a, bool newval) override;
    int  getSize ();
    void setWBProvider (WBProvider* p)
    {