Merge branch 'dev' into newlocallab

2020-02-07 18:24:50 +01:00
parent ff8c0748e9 aae22fcc86
commit c984a95b9e
83 changed files with 1676 additions and 1767 deletions
--- a/rtgui/curveeditor.h
+++ b/rtgui/curveeditor.h
@@ -18,8 +18,8 @@
 */
 #pragma once

-#include "coloredbar.h"
 #include "editcallbacks.h"
+#include "guiutils.h"

 #include "../rtengine/diagonalcurvetypes.h"
 #include "../rtengine/flatcurvetypes.h"
@@ -28,6 +28,7 @@

 class CurveEditorGroup;
 class CurveEditorSubGroup;
+class ColorProvider;
 class PopUpToggleButton;

 /*