#
# ChangeLog for code/branches/merger
#
# Generated by Trac 1.0.9
# Nov 29, 2024, 1:57:42 AM

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


Tue, 20 Nov 2007 19:59:21 GMT nicolasc [226]
	* code/trunk/LICENSE (modified)

	changed license to gplv2