hybrid 6ff85907c0 Merged revisions 2375:2440 from trunk. ...

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2441 dfc29bdd-3216-0410-991c-e03cc46cb475

2009-07-03 09:11:53 +00:00

..

empty/empty

Merged all revisions up to 1976 from trunk into ogl-es branch.

2008-12-19 09:56:25 +00:00

media

Merged revisions 2375:2440 from trunk.

2009-07-03 09:11:53 +00:00

b3dAnimation.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

burningsVideo.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

collisionResponseAnimator.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

cursorSetVisible.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

disambiguateTextures.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

drawPixel.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

drawRectOutline.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

enumerateImageManipulators.cpp

Merged from trunk revisions 2144:2363

2009-05-05 00:09:53 +00:00

exports.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

fast_atof.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

filesystem.cpp

Merged revisions 2375:2440 from trunk.

2009-07-03 09:11:53 +00:00

flyCircleAnimator.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

guiDisabledMenu.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

irrCoreEquals.cpp

Merged from trunk revisions 2144:2363

2009-05-05 00:09:53 +00:00

line2dIntersectWith.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

main.cpp

Merged revisions 2375:2440 from trunk.

2009-07-03 09:11:53 +00:00

makeColorKeyTexture.cpp

Merged from trunk revisions 2144:2363

2009-05-05 00:09:53 +00:00

Makefile

Merged from trunk revisions 2144:2363

2009-05-05 00:09:53 +00:00

matrixOps.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

md2Animation.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

planeMatrix.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

removeCustomAnimator.cpp

Merged revisions 2375:2440 from trunk.

2009-07-03 09:11:53 +00:00

sceneCollisionManager.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

sceneNodeAnimator.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

softwareDevice.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

terrainSceneNode.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

testDimension2d.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

testGeometryCreator.cpp

Merged from trunk revisions 2144:2363

2009-05-05 00:09:53 +00:00

tests_vc8.sln

Merged from trunk revisions 2144:2363

2009-05-05 00:09:53 +00:00

tests_vc8.vcproj

Merged from trunk revisions 2144:2363

2009-05-05 00:09:53 +00:00

tests_vc9.sln

Merged all revisions up to 1976 from trunk into ogl-es branch.

2008-12-19 09:56:25 +00:00

tests_vc9.vcproj

Merged from trunk revisions 2144:2363

2009-05-05 00:09:53 +00:00

tests-last-passed-at.txt

Merged revisions 2375:2440 from trunk.

2009-07-03 09:11:53 +00:00

tests-readme.txt

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

tests.cbp

Merged from trunk revisions 2144:2363

2009-05-05 00:09:53 +00:00

tests.workspace

Merged from trunk revisions 2144:2363

2009-05-05 00:09:53 +00:00

testUtils.cpp

Merged from trunk revisions 2144:2363

2009-05-05 00:09:53 +00:00

testUtils.h

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

testVector2d.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

testVector3d.cpp

Merged revisions 2375:2440 from trunk.

2009-07-03 09:11:53 +00:00

textureRenderStates.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

transparentAlphaChannelRef.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

vectorPositionDimension2d.cpp

Merged from trunk, all revisions from 1977 to 2143.

2009-01-27 13:23:36 +00:00

writeImageToFile.cpp

Merged from trunk revisions 2144:2363

2009-05-05 00:09:53 +00:00

zipReader.cpp

Merged revisions 2375:2440 from trunk.

2009-07-03 09:11:53 +00:00