hybrid e52f7c693c Final merge of ancient file revisions. Most stuff seems up to date now, only OSX device is probably completely broken and needs a fresh copy from trunk. Will merge latest trunk again in next run in order to have a proper version number in the logs again. ... git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4492 dfc29bdd-3216-0410-991c-e03cc46cb475		2013-04-04 16:15:53 +00:00
..
Makefile	Merged from trunk, revisions 3300-3365. Another large bugfix merge.	2010-07-18 21:25:27 +00:00
MaterialViewer.cbp	Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.	2013-03-28 17:04:07 +00:00
MaterialViewer.dev	Merged revisions 2897:3173 from trunk. Huge update with uncountable fixes, additions, etc.	2010-01-23 20:13:43 +00:00
MaterialViewer.vcproj	Merge from trunk, revisions up to 3726. Another major update to latest 1.8 changes.	2011-05-18 22:21:50 +00:00
MaterialViewer_vc8.vcproj	Merged from trunk, revisions 3300-3365. Another large bugfix merge.	2010-07-18 21:25:27 +00:00
MaterialViewer_vc9.vcproj	Merge from trunk, revisions up to 3726. Another major update to latest 1.8 changes.	2011-05-18 22:21:50 +00:00
MaterialViewer_vc10.vcxproj	Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.	2013-03-28 17:04:07 +00:00
MaterialViewer_vc11.vcxproj	Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.	2013-03-28 17:04:07 +00:00
main.cpp	Final merge of ancient file revisions. Most stuff seems up to date now, only OSX device is probably completely broken and needs a fresh copy from trunk. Will merge latest trunk again in next run in order to have a proper version number in the logs again.	2013-04-04 16:15:53 +00:00