Merge branch 'dev' into newlocallab

2019-11-04 23:01:33 +01:00
parent 91b80b23d2 ec5eaf9cea
commit 033d9fe02a
395 changed files with 2523 additions and 2740 deletions
--- a/rtengine/rawimage.cc
+++ b/rtengine/rawimage.cc
@@ -15,12 +15,11 @@
 #include "settings.h"
 #include "camconst.h"
 #include "utils.h"
+#include "rtengine.h"

 namespace rtengine
 {

-extern const Settings* settings;
-
 RawImage::RawImage(const Glib::ustring &name)
    : data(nullptr)
    , prefilters(0)