merge with dev

2019-12-01 06:56:16 +01:00
parent 1311626888 3748133cd2
commit d701afdef0
116 changed files with 4040 additions and 564 deletions
--- a/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -190,7 +190,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);