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/rtengine/dcrop.cc
+++ b/rtengine/dcrop.cc
@@ -23,6 +23,7 @@
 #include "procparams.h"
 #include "refreshmap.h"
 #include "rt_math.h"
+#include "../rtgui/editcallbacks.h"
 #include "guidedfilter.h"

 namespace