#
# ChangeLog for branches/christmas_branche/src/orxonox.h in orxonox.OLD
#
# Generated by Trac 1.0.9
# Jun 2, 2024, 9:16:45 AM

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


Fri, 09 Dec 2005 11:31:01 GMT patrick [5996]
	* trunk/src/Makefile.am (modified)
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/defs/debug.h (modified)
	* trunk/src/defs/globals.h (modified)
	* trunk/src/lib/network/Makefile.am (modified)
	* trunk/src/lib/network/network_manager.cc (modified)
	* trunk/src/lib/network/network_manager.h (modified)
	* trunk/src/lib/network/network_socket.cc (modified)
	* trunk/src/lib/network/network_socket.h (modified)
	* trunk/src/lib/network/network_stream.cc (modified)
	* trunk/src/lib/network/network_stream.h (modified)
	* trunk/src/lib/network/server_socket.cc (copied)
	* trunk/src/lib/network/server_socket.h (copied)
	* trunk/src/lib/network/synchronizeable.cc (modified)
	* trunk/src/lib/network/synchronizeable.h (modified)
	* trunk/src/lib/sound/sound_engine.cc (modified)
	* trunk/src/orxonox.cc (modified)
	* trunk/src/orxonox.h (modified)
	* trunk/src/story_entities/world.cc (modified)
	* trunk/src/subprojects/network/Makefile.am (modified)
	* trunk/src/subprojects/network/network_unit_test.cc (modified)
	* trunk/src/subprojects/network/read_sync.cc (copied)
	* trunk/src/subprojects/network/read_sync.h (copied)
	* trunk/src/subprojects/network/simple_sync.cc (modified)
	* trunk/src/subprojects/network/simple_sync.h (modified)
	* trunk/src/subprojects/network/write_sync.cc (copied)
	* trunk/src/subprojects/network/write_sync.h (copied)
	* trunk/src/world_entities/space_ships/space_ship.h (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	orxonox/trunk: merged network branche into trunk with command svn ...