merge with dev

2019-11-22 07:28:09 +01:00
parent aa84bb3b0c 7b54c7f2a4
commit e366cf39a4
13 changed files with 16 additions and 115 deletions
--- a/rtengine/improcfun.h
+++ b/rtengine/improcfun.h
@@ -24,7 +24,6 @@
 #include "gamutwarning.h"
 #include "jaggedarray.h"
 #include "pipettebuffer.h"
-#include "shmap.h"
 #include "array2D.h"

 #include <cairomm/cairomm.h>