#
# ChangeLog for code/branches/merger/src/CMakeLists.txt
#
# Generated by Trac 1.0.9
# Jun 1, 2024, 8:28:56 AM

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

	created merger branch


Mon, 26 Nov 2007 15:26:17 GMT landauf [258]
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/orxonox (copied)
	* code/trunk/src/orxonox/core (copied)
	* code/trunk/src/orxonox/core/ClassFactory.h (copied)
	* code/trunk/src/orxonox/core/Factory.cc (copied)
	* code/trunk/src/orxonox/core/Factory.h (copied)
	* code/trunk/src/orxonox/core/Identifier.cc (copied)
	* code/trunk/src/orxonox/core/Identifier.h (copied)
	* code/trunk/src/orxonox/core/IdentifierIncludes.h (copied)
	* code/trunk/src/orxonox/core/IdentifierList.cc (copied)
	* code/trunk/src/orxonox/core/IdentifierList.h (copied)
	* code/trunk/src/orxonox/core/Iterator.h (copied)
	* code/trunk/src/orxonox/core/MetaObjectList.cc (copied)
	* code/trunk/src/orxonox/core/MetaObjectList.h (copied)
	* code/trunk/src/orxonox/core/ObjectList.h (copied)
	* code/trunk/src/orxonox/core/OrxonoxClass.cc (copied)
	* code/trunk/src/orxonox/core/OrxonoxClass.h (copied)
	* code/trunk/src/orxonox/objects (copied)
	* code/trunk/src/orxonox/objects/BaseObject.cc (copied)
	* code/trunk/src/orxonox/objects/BaseObject.h (copied)
	* code/trunk/src/orxonox/objects/Test.h (copied)
	* code/trunk/src/orxonox/objects/test1.cc (copied)
	* code/trunk/src/orxonox/objects/test1.h (copied)
	* code/trunk/src/orxonox/objects/test2.cc (copied)
	* code/trunk/src/orxonox/objects/test2.h (copied)
	* code/trunk/src/orxonox/objects/test3.cc (copied)
	* code/trunk/src/orxonox/objects/test3.h (copied)
	* code/trunk/src/orxonox/orxonox.cc (moved)

	merged object-hierarchy back to trunk