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/rtgui/controlspotpanel.cc
+++ b/rtgui/controlspotpanel.cc
@@ -24,6 +24,7 @@
 #include <iomanip>
 #include "editwidgets.h"
 #include "options.h"
+#include "rtimage.h"

 using namespace rtengine;
 extern Options options;