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.cc
+++ b/rtgui/whitebalance.cc
@@ -447,10 +447,6 @@ void WhiteBalance::adjusterChanged(Adjuster* a, double newval)
    }
 }

-void WhiteBalance::adjusterAutoToggled(Adjuster* a, bool newval)
-{
-}
-
 void WhiteBalance::optChanged ()
 {
    Gtk::TreeModel::Row row = getActiveMethod();