#
# ChangeLog for code/branches/merger/src/loader
#
# Generated by Trac 1.0.9
# Nov 18, 2024, 11:19:45 PM

Wed, 28 Nov 2007 14:10:28 GMT nicolasc [319]
	* code/branches/merger/bin/resources.cfg (modified)
	* code/branches/merger/src/CMakeLists.txt (modified)
	* code/branches/merger/src/loader/CMakeLists.txt (modified)
	* code/branches/merger/src/network/CMakeLists.txt (modified)
	* code/branches/merger/src/orxonox/CMakeLists.txt (modified)
	* code/branches/merger/src/orxonox/core/CMakeLists.txt (modified)
	* code/branches/merger/src/orxonox/hud/CMakeLists.txt (added)
	* code/branches/merger/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/merger/src/spaceship_steering.cc (copied)
	* code/branches/merger/src/spaceship_steering.h (copied)

	initial merge of steering


Wed, 28 Nov 2007 01:26:29 GMT nicolasc [301]
	* code/branches/merger/CMakeLists.txt (modified)
	* code/branches/merger/src/class_hierarchy/CMakeLists.txt (modified)
	* code/branches/merger/src/loader/CMakeLists.txt (modified)
	* code/branches/merger/src/main.cc (deleted)
	* code/branches/merger/src/orxonox/CMakeLists.txt (modified)
	* code/branches/merger/src/weapon/CMakeLists.txt (modified)

	2nd tier cleanup


Tue, 27 Nov 2007 22:07:15 GMT nicolasc [282]
	* code/branches/merger/src/loader/CMakeLists.txt (modified)
	* code/branches/merger/src/orxonox/objects/CMakeLists.txt (modified)

	minor fix


Tue, 27 Nov 2007 21:58:08 GMT nicolasc [281]
	* code/branches/merger/src/loader/CMakeLists.txt (added)
	* code/branches/merger/src/orxonox/objects/CMakeLists.txt (added)

	added to missing CMLs


Tue, 27 Nov 2007 20:47:07 GMT nicolasc [275]
	* code/branches/merger (copied)

	created merger branch


Mon, 05 Nov 2007 12:16:39 GMT nicolasc [164]
	* code/trunk/bin/levels (added)
	* code/trunk/bin/levels/sp_level_moonstation.oxw (added)
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/loader (added)
	* code/trunk/src/loader/LevelLoader.cc (added)
	* code/trunk/src/loader/LevelLoader.h (added)
	* code/trunk/src/loader/Light.cc (added)
	* code/trunk/src/loader/Light.h (added)
	* code/trunk/src/loader/LightManager.cc (added)
	* code/trunk/src/loader/LightManager.h (added)
	* code/trunk/src/orxonox.cc (modified)
	* code/trunk/src/xml (added)
	* code/trunk/src/xml/xmlParser.cc (added)
	* code/trunk/src/xml/xmlParser.h (added)

	Brute force megre of xml branch