#
# ChangeLog for branches/christmas_branche/src/subprojects/collision_detection in orxonox.OLD
#
# Generated by Trac 1.0.9
# Jun 2, 2024, 10:22:07 AM

Tue, 20 Dec 2005 14:39:48 GMT bensch [6194]
	* branches/christmas_branche/src/subprojects (modified)
	* branches/christmas_branche/src/subprojects/collision_detection (modified)
	* branches/christmas_branche/src/subprojects/importer (modified)
	* branches/christmas_branche/src/subprojects/network (modified)
	* branches/christmas_branche/src/subprojects/particles (modified)
	* branches/christmas_branche/src/subprojects/testmain (modified)
	* branches/christmas_branche/src/util (modified)

	christmas: all ignores finished


Mon, 19 Dec 2005 18:29:26 GMT patrick [6165]
	* branches/christmas_branche (copied)
	* branches/christmas_branche/src/lib/graphics/importer/texture.cc (modified)
	* trunk/src/lib/graphics/importer/texture.cc (modified)

	branches: added a branche christmas for some christmas tests


Tue, 29 Nov 2005 10:07:43 GMT bensch [5819]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/defs/globals.h (modified)
	* trunk/src/defs/stdincl.h (modified)
	* trunk/src/lib/coord/p_node.cc (modified)
	* trunk/src/lib/event/key_mapper.h (modified)
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/lib/graphics/spatial_separation/quadtree_node.cc (modified)
	* trunk/src/lib/graphics/spatial_separation/quadtree_node.h (modified)
	* trunk/src/lib/sound/sound_engine.cc (modified)
	* trunk/src/lib/sound/sound_engine.h (modified)
	* trunk/src/lib/tinyxml/tinystr.cc (modified)
	* trunk/src/lib/tinyxml/tinystr.h (modified)
	* trunk/src/lib/tinyxml/tinyxml.cc (modified)
	* trunk/src/lib/tinyxml/tinyxml.h (modified)
	* trunk/src/lib/tinyxml/tinyxmlerror.cc (modified)
	* trunk/src/lib/tinyxml/tinyxmlparser.cc (modified)
	* trunk/src/orxonox.cc (modified)
	* trunk/src/story_entities/world.cc (modified)
	* trunk/src/subprojects/collision_detection/collision_detection.cc (modified)
	* trunk/src/subprojects/framework.cc (modified)
	* trunk/src/util/loading/game_loader.cc (modified)
	* trunk/src/util/loading/game_loader.h (modified)
	* trunk/src/world_entities/weapons/aiming_turret.cc (modified)
	* trunk/src/world_entities/weapons/cannon.cc (modified)
	* trunk/src/world_entities/weapons/ground_turret.cc (modified)
	* trunk/src/world_entities/weapons/ground_turret.h (modified)
	* trunk/src/world_entities/weapons/rocket.cc (modified)
	* trunk/src/world_entities/weapons/test_gun.cc (modified)
	* trunk/src/world_entities/weapons/turret.cc (modified)

	orxonox/trunk: merged branches world_entities to trunk again
	merged ...