#
# ChangeLog for code/branches/merge/src/tinyxml
#
# Generated by Trac 1.0.9
# Nov 15, 2024, 10:52:20 AM

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

	creating merge branch


Wed, 30 Apr 2008 17:57:57 GMT rgrieder [1209]
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/core/BaseObject.cc (modified)
	* code/trunk/src/core/CMakeLists.txt (modified)
	* code/trunk/src/core/Loader.cc (modified)
	* code/trunk/src/core/XMLPort.h (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/OrxonoxStableHeaders.h (modified)
	* code/trunk/src/orxonox/objects/Ambient.cc (modified)
	* code/trunk/src/orxonox/objects/Camera.cc (modified)
	* code/trunk/src/orxonox/objects/Model.cc (modified)
	* code/trunk/src/orxonox/objects/Skybox.cc (modified)
	* code/trunk/src/orxonox/objects/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/objects/WorldEntity.cc (modified)
	* code/trunk/src/orxonox/objects/weapon/AmmunitionDump.cc (modified)
	* code/trunk/src/orxonox/objects/weapon/BulletManager.h (modified)
	* code/trunk/src/tinyxml (moved)
	* code/trunk/src/tinyxml/CMakeLists.txt (added)
	* code/trunk/src/tolua (moved)
	* code/trunk/src/tolua/CMakeLists.txt (modified)
	* code/trunk/src/util/CMakeLists.txt (modified)
	* code/trunk/visual_studio/orxonox_vc8.sln (modified)
	* code/trunk/visual_studio/vc8/tixml.vcproj (modified)
	* code/trunk/visual_studio/vc8/tolua++.vcproj (modified)

	- moved tinyxml and tolua folders