cutealien c17023f55c Merging r6128 through r6139 from trunk to ogl-es branch. ... Note: I could not merge 2 OSX project files as I'm not sure how to correctly resolve their conflicts. Maybe old version for those files are still OK, as ogl-es branch got updated once before (leaving trunk behind). In case it causes problems I hope someone can send another patch for those 2 files: source/Irrlicht/Irrlicht.xcodeproj/xcshareddata/xcschemes source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6140 dfc29bdd-3216-0410-991c-e03cc46cb475		2020-10-01 19:58:50 +02:00
..
Exporters/Blender	Merge revisions r5604 through r5621 from trunk to ogl-es.	2018-06-17 20:01:00 +00:00
FileToHeader	Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.	2013-03-28 17:04:07 +00:00
GUIEditor	Merging r6128 through r6139 from trunk to ogl-es branch.	2020-10-01 19:58:50 +02:00
IrrFontTool	Merge revisions r5337:r5415 from trunk to ogl-es.	2017-04-12 15:33:31 +00:00
MeshConverter	Merge revision 4977:5180 from trunk to ogl-es.	2015-11-12 22:32:01 +00:00
irrEdit	Moved everything to /trunk	2007-05-20 18:03:49 +00:00