minetest
/
irrlicht
mirror of https://github.com/minetest/irrlicht.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
irrlicht/examples/Demo
History
cutealien 8b9947f9f6 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-09-29 20:22:28 +00:00
..
Demo.xcodeproj Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
CDemo.cpp Merging r6128 through r6139 from trunk to ogl-es branch. 2020-09-29 20:22:28 +00:00
CDemo.h Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
CMainMenu.cpp Merging r6075 through r6106 from trunk to ogl-es branch. 2020-06-12 20:41:49 +00:00
CMainMenu.h Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
Demo.vcproj Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
Demo_vc10.vcxproj Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
Demo_vc11.vcxproj Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
Demo_vc12.vcxproj Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
Demo_vc14.vcxproj Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
Makefile Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
demo.cbp Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
icon.ico Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
main.cpp Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
resource.h Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
resscript.rc Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00