Merge branch 'dev' into newlocallab

2019-11-04 23:01:33 +01:00
parent 91b80b23d2 ec5eaf9cea
commit 033d9fe02a
395 changed files with 2523 additions and 2740 deletions
--- a/rtgui/toolbar.cc
+++ b/rtgui/toolbar.cc
@@ -20,6 +20,7 @@
 #include "toolbar.h"
 #include "multilangmgr.h"
 #include "guiutils.h"
+#include "rtimage.h"

 ToolBar::ToolBar () : showColPickers(true), listener (nullptr), pickerListener(nullptr)
 {