Merge branch 'dev' into spot-removal-tool

2019-07-31 23:03:50 +02:00
parent 56b2649cd2 2283d1c969
commit 437d883082
269 changed files with 5554 additions and 33357 deletions
--- a/rtgui/sharpenedge.cc
+++ b/rtgui/sharpenedge.cc
@@ -146,10 +146,6 @@ void SharpenEdge::adjusterChanged(Adjuster* a, double newval)
    }
 }

-void SharpenEdge::adjusterAutoToggled(Adjuster* a, bool newval)
-{
-}
-
 void SharpenEdge::setBatchMode(bool batchMode)
 {
    passes->showEditedCB   ();