merge wit dev

2019-11-07 07:17:19 +01:00
parent f72ec7bde2 a2d5ef356c
commit d621721ffe
417 changed files with 4353 additions and 5352 deletions
--- a/rtgui/wavelet.cc
+++ b/rtgui/wavelet.cc
@@ -23,11 +23,12 @@
 #include "editcallbacks.h"
 #include "guiutils.h"
 #include "rtimage.h"
+#include "options.h"
 #include "eventmapper.h"
+#include "../rtengine/color.h"

 using namespace rtengine;
 using namespace rtengine::procparams;
-extern Options options;

 namespace
 {