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/editwidgets.h
+++ b/rtgui/editwidgets.h
@@ -20,12 +20,14 @@

 #ifdef GUIVERSION

-#include "rtsurface.h"
+#include <glibmm/ustring.h>
+
 #include "editbuffer.h"
 #include "editcoordsys.h"
 #include "../rtengine/coord.h"

 class ObjectMOBuffer;
+class RTSurface;

 /** @file
 *