Merge branch 'dev' into spot-removal-tool

2019-03-25 22:35:17 +01:00
parent e0c04955e3 90e1480b7f
commit 5b136d664d
100 changed files with 5863 additions and 2811 deletions
--- a/rtgui/labgrid.cc
+++ b/rtgui/labgrid.cc
@@ -39,6 +39,8 @@
 #include "labgrid.h"
 #include "options.h"

+#include "options.h"
+
 using rtengine::Color;