merge with dev

2019-11-10 08:56:38 +01:00
parent ba2147033c 5235a82a70
commit e79bb87c91
99 changed files with 482 additions and 199 deletions
--- a/rtgui/rtwindow.cc
+++ b/rtgui/rtwindow.cc
@@ -29,6 +29,7 @@
 #include "whitebalance.h"
 #include "../rtengine/settings.h"
 #include "batchqueuepanel.h"
+#include "batchqueueentry.h"
 #include "editorpanel.h"
 #include "filepanel.h"
 #include "filmsimulation.h"