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/flatcurveeditorsubgroup.cc
+++ b/rtgui/flatcurveeditorsubgroup.cc
@@ -32,6 +32,7 @@
 #include "curveeditor.h"
 #include "flatcurveeditorsubgroup.h"
 #include "rtimage.h"
+#include "options.h"

 #include "../rtengine/curves.h"