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
This commit is contained in:
cutealien
2021-08-26 21:57:27 +00:00
parent 08a2846a93
commit 21302d038a
119 changed files with 9580 additions and 4362 deletions

View File

@ -76,7 +76,8 @@ public:
/*
Load xml from disk, overwrite default settings
The xml we are trying to load has the following structure
settings nested in sections nested in the root node, like so
settings nested in sections nested in the root node, like:
\verbatim
<pre>
<?xml version="1.0"?>
<mygame>
@ -87,6 +88,7 @@ public:
</video>
</mygame>
</pre>
\endverbatim
*/
bool load()
{

File diff suppressed because one or more lines are too long