cutealien
|
0fc5d21a40
|
Merge revision 5277:5282 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5288 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2016-03-18 17:24:46 +00:00 |
nadro
|
bf3273cb5f
|
- Merged rev 5222-5223 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5224 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2015-12-17 19:48:24 +00:00 |
nadro
|
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 |
hybrid
|
3f0c8e3a3b
|
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: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4492 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2013-04-04 16:15:53 +00:00 |
hybrid
|
0753afac9d
|
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4488 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2013-03-28 17:04:07 +00:00 |
hybrid
|
7ae68647e9
|
Next large merge from trunk, revisions 3729-3830
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3831 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2011-06-09 07:08:47 +00:00 |
hybrid
|
de2e004b83
|
Merge from trunk, revisions 3370-3559. Huge update to catch up with Irrlicht 1.7.2+ and latest 1.8 developments.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3560 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2011-01-14 15:36:50 +00:00 |
hybrid
|
7bae34bc61
|
Merged revisions 3175-3300 from trunk. Another huge update, bringing the ogl-es branch to the latest version of Irrlicht.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3301 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2010-06-01 22:52:38 +00:00 |
hybrid
|
d07fc00916
|
Merged revisions 2897:3173 from trunk. Huge update with uncountable fixes, additions, etc.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3174 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2010-01-23 20:13:43 +00:00 |