#
# ChangeLog for orxonox/branches/ll2trunktemp/ChangeLog in orxonox.OLD
#
# Generated by Trac 1.0.9
# Jun 13, 2024, 1:45:13 AM

Sat, 23 Apr 2005 08:02:09 GMT chris [3939]
	* orxonox/branches/ll2trunktemp (copied)

	orxonox/branches: A separate battleground for Fuzzy's merging
	onslaught


Wed, 13 Apr 2005 10:33:07 GMT bensch [3790]
	* orxonox/trunk/ChangeLog (modified)
	* orxonox/trunk/config.h.in (modified)
	* orxonox/trunk/configure (modified)
	* orxonox/trunk/configure.ac (modified)
	* orxonox/trunk/src/Makefile.am (modified)
	* orxonox/trunk/src/Makefile.in (modified)
	* orxonox/trunk/src/animation.cc (copied)
	* orxonox/trunk/src/animation.h (copied)
	* orxonox/trunk/src/defs/debug.h (modified)
	* orxonox/trunk/src/defs/glincl.h (modified)
	* orxonox/trunk/src/lib/graphics/font (deleted)
	* orxonox/trunk/src/lib/graphics/graphics_engine.cc (modified)
	* orxonox/trunk/src/lib/graphics/graphics_engine.h (modified)
	* orxonox/trunk/src/lib/graphics/importer/material.cc (modified)
	* orxonox/trunk/src/lib/graphics/importer/material.h (modified)
	* orxonox/trunk/src/lib/graphics/importer/texture.cc (modified)
	* orxonox/trunk/src/lib/graphics/importer/texture.h (modified)
	* orxonox/trunk/src/lib/graphics/text_engine.cc (copied)
	* orxonox/trunk/src/lib/graphics/text_engine.h (copied)
	* orxonox/trunk/src/lib/util/list.h (modified)
	* orxonox/trunk/src/lib/util/resource_manager.cc (modified)
	* orxonox/trunk/src/lib/util/resource_manager.h (modified)
	* orxonox/trunk/src/orxonox.cc (modified)
	* orxonox/trunk/src/story_entities/world.cc (modified)
	* orxonox/trunk/src/story_entities/world.h (modified)

	orxonox/trunk: merged the textEngine back into the trunk.
	merged ...