Merge branch 'dev' into newlocallab

2019-03-12 14:57:17 +01:00
parent 4756e5184c 86690f1ca0
commit 020204e0cb
150 changed files with 1822 additions and 1298 deletions
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -25,6 +25,8 @@
 #include "guiutils.h"
 #include "version.h"

+#include "../rtengine/procparams.h"
+
 #ifdef _OPENMP
 #include <omp.h>
 #endif