merge with Dev

2017-12-14 09:11:35 +01:00
parent 73b695652c 1854147ce9
commit ce5f9f1715
4 changed files with 10 additions and 3 deletions
--- a/rtengine/colortemp.h
+++ b/rtengine/colortemp.h
@@ -21,6 +21,7 @@

 #include <cmath>
 #include <map>
+#include <string>

 namespace rtengine
 {