#
# ChangeLog for code/branches/merge
#
# Generated by Trac 1.0.9
# Jul 27, 2025, 5:32:10 PM

Tue, 13 May 2008 13:45:19 GMT rgrieder [1263]
	* code/branches/merge/src/core/BaseObject.cc (modified)
	* code/branches/merge/src/core/CoreIncludes.h (modified)
	* code/branches/merge/src/core/Debug.h (modified)
	* code/branches/merge/src/core/Error.cc (modified)
	* code/branches/merge/src/core/Error.h (modified)
	* code/branches/merge/src/core/Namespace.cc (modified)
	* code/branches/merge/src/core/OrxonoxClass.cc (modified)
	* code/branches/merge/src/orxonox/GraphicsEngine.cc (modified)
	* code/branches/merge/src/orxonox/GraphicsEngine.h (modified)
	* code/branches/merge/src/orxonox/Main.cc (modified)
	* code/branches/merge/src/orxonox/Orxonox.cc (modified)
	* code/branches/merge/src/orxonox/Orxonox.h (modified)
	* code/branches/merge/src/orxonox/OrxonoxPlatform.h (modified)
	* code/branches/merge/src/orxonox/console/InGameConsole.cc (modified)
	* code/branches/merge/src/orxonox/objects/Explosion.cc (modified)
	* code/branches/merge/src/orxonox/objects/Model.cc (modified)
	* code/branches/merge/src/orxonox/objects/Model.h (modified)
	* code/branches/merge/src/orxonox/objects/NPC.cc (modified)
	* code/branches/merge/src/orxonox/objects/Projectile.cc (modified)
	* code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified)
	* code/branches/merge/src/orxonox/objects/WorldEntity.cc (modified)
	* code/branches/merge/src/orxonox/tools/Timer.cc (modified)

	- merged ogre branch into merge branch


Tue, 13 May 2008 13:22:56 GMT scheusso [1262]
	* code/branches/merge (copied)

	creating merge branch


Tue, 06 May 2008 19:10:46 GMT landauf [1242]
	* code/trunk/cmakeclearcache (modified)

	corrected spelling mistake