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/myflatcurve.cc
+++ b/rtgui/myflatcurve.cc
@@ -23,6 +23,7 @@
 #include "myflatcurve.h"

 #include "editcallbacks.h"
+#include "rtscalable.h"

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