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/improcfun.cc
+++ b/rtengine/improcfun.cc
@@ -45,7 +45,6 @@
 #include "satandvalueblendingcurve.h"
 #include "StopWatch.h"
 #include "procparams.h"
-#include "../rtgui/ppversion.h"
 #include "../rtgui/editcallbacks.h"

 #ifdef _DEBUG