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/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -20,10 +20,11 @@

 #include <cmath>
 #include <cstdio>
+#include <map>
 #include <type_traits>
 #include <vector>

-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include <lcms2.h>

 #include "noncopyable.h"