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/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -24,6 +24,7 @@
 #include "../rtengine/imagesource.h"
 #include "../rtengine/iccstore.h"
 #include "batchqueue.h"
+#include "batchqueueentry.h"
 #include "soundman.h"
 #include "rtimage.h"
 #include "rtwindow.h"