#
# ChangeLog for code/branches/merger/bin
#
# Generated by Trac 1.0.9
# Nov 22, 2024, 1:06:35 PM

Tue, 20 Nov 2007 20:03:57 GMT nicolasc [228]
	* code/branches/merger/bin/run-script (modified)
	* code/branches/merger/src/misc (copied)
	* code/branches/merger/src/misc/String2Number.h (copied)
	* code/branches/merger/src/orxonox.cc (modified)
	* code/branches/merger/src/tinyxml (copied)
	* code/branches/merger/src/tinyxml/tinystr.cc (copied)
	* code/branches/merger/src/tinyxml/tinystr.h (copied)
	* code/branches/merger/src/tinyxml/tinyxml.cc (copied)
	* code/branches/merger/src/tinyxml/tinyxml.h (copied)
	* code/branches/merger/src/tinyxml/tinyxmlerror.cc (copied)
	* code/branches/merger/src/tinyxml/tinyxmlparser.cc (copied)

	merged xml


Tue, 20 Nov 2007 20:00:19 GMT nicolasc [227]
	* code/branches/merger (copied)

	created merger branch for test merging


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