merge with dev

2019-03-23 07:21:18 +01:00
parent 48d30e50c7 4640858567
commit 3fe2aaed79
52 changed files with 2233 additions and 2050 deletions
--- a/rtgui/wavelet.cc
+++ b/rtgui/wavelet.cc
@@ -19,7 +19,8 @@

 #include "wavelet.h"
 #include <cmath>
-#include "edit.h"
+
+#include "editcallbacks.h"
 #include "guiutils.h"
 #include "rtimage.h"
 #include "eventmapper.h"