b849f86663
Merging r6337 through r6363 from trunk to ogl-es branch
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6379 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-05-08 11:42:26 +02:00
73c5b296bb
Merging r6107 through r6116 from trunk to ogl-es branch
...
Caught up with trunk again.
Not yet tested beside compiling (quick test failed, but seems like nothing from the new changes).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6117 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-06-14 11:34:02 +02:00
237eb07bf4
Merging r5807 from trunk to ogl-es branch.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5808 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-04-24 21:10:47 +00:00
a12369f2ef
Merge revisions r5450:r5453 from trunk to ogl-es
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5454 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-24 13:51:58 +00:00
ce6b7562ce
Merge revision 4977:5180 from trunk to ogl-es.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5181 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-12 22:32:01 +00:00
cutealien
nadro