merge with dev

2019-11-06 08:30:51 +01:00
parent 4a46aeac13 9ddd2a2a9b
commit e4f94f9f33
18 changed files with 181 additions and 416 deletions
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -39,7 +39,6 @@
 #include "refreshmap.h"

 #include "../rtgui/options.h"
-#include "../rtgui/ppversion.h"

 #ifdef _OPENMP
 #include <omp.h>