Merge branch 'dev' into spot-removal-tool

2019-12-08 00:37:54 +01:00
parent 1cf62a2a65 ba36a92240
commit c23f976302
463 changed files with 16158 additions and 10338 deletions
--- a/rtgui/labgrid.cc
+++ b/rtgui/labgrid.cc
@@ -39,7 +39,9 @@
 #include "labgrid.h"
 #include "options.h"

+#include "../rtengine/color.h"
 #include "options.h"
+#include "rtimage.h"

 using rtengine::Color;