Merging r6196 through r6248 from trunk to ogl-es branch

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6249 dfc29bdd-3216-0410-991c-e03cc46cb475
2021-08-26 21:57:27 +00:00
parent 08a2846a93
commit 21302d038a
119 changed files with 9580 additions and 4362 deletions
--- a/tools/GUIEditor/CGUIAttribute.h
+++ b/tools/GUIEditor/CGUIAttribute.h
@@ -14,7 +14,6 @@
 #include "IGUIFont.h"
 #include "IGUIStaticText.h"
 #include "IAttributes.h"
-#include "CGUIEditWorkspace.h"

 namespace irr
 {