merge with Dev

2018-01-23 17:52:31 +01:00
parent 9f0b5dc844 4046a3c9b9
commit 62d9825bce
15 changed files with 39 additions and 89 deletions
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@@ -40,7 +40,6 @@
 #include "improccoordinator.h"
 #include "clutstore.h"
 #include "ciecam02.h"
-//#define BENCHMARK
 #include "StopWatch.h"
 #include "../rtgui/ppversion.h"
 #include "../rtgui/guiutils.h"