merge wit dev

2019-11-07 07:17:19 +01:00
parent f72ec7bde2 a2d5ef356c
commit d621721ffe
417 changed files with 4353 additions and 5352 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"