merge with dev

2019-11-28 06:50:05 +01:00
parent f5a5b9a3f5 55709bc449
commit d645dc5951
75 changed files with 181 additions and 213 deletions
--- a/rtgui/toolbar.cc
+++ b/rtgui/toolbar.cc
@@ -20,6 +20,7 @@
 #include "toolbar.h"
 #include "multilangmgr.h"
 #include "guiutils.h"
+#include "lockablecolorpicker.h"
 #include "rtimage.h"

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