merge with dev

2019-11-22 07:28:09 +01:00
parent aa84bb3b0c 7b54c7f2a4
commit e366cf39a4
13 changed files with 16 additions and 115 deletions
--- a/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -187,7 +187,6 @@ protected:

    MyMutex minit;  // to gain mutually exclusive access to ... to what exactly?

-    void progress(Glib::ustring str, int pr);
    void reallocAll();
    void updateLRGBHistograms();
    void setScale(int prevscale);