#
# ChangeLog for branches/network_merged/src/lib/lang/base_object.cc in orxonox.OLD
#
# Generated by Trac 1.0.9
# Jun 2, 2024, 4:44:37 AM

Fri, 30 Dec 2005 00:52:26 GMT bensch [6340]
	* branches/network_merged/src/defs/class_id.h (modified)
	* branches/network_merged/src/lib/coord/p_node.cc (modified)
	* branches/network_merged/src/lib/coord/p_node.h (modified)
	* branches/network_merged/src/lib/lang/base_object.cc (modified)
	* branches/network_merged/src/lib/lang/base_object.h (modified)
	* branches/network_merged/src/lib/network/converter.cc (modified)
	* branches/network_merged/src/lib/network/converter.h (modified)
	* branches/network_merged/src/lib/network/data_stream.h (modified)
	* branches/network_merged/src/lib/network/handshake.cc (modified)
	* branches/network_merged/src/lib/network/handshake.h (modified)
	* branches/network_merged/src/lib/network/network_game_manager.cc (modified)
	* branches/network_merged/src/lib/network/network_game_manager.h (modified)
	* branches/network_merged/src/lib/network/network_manager.cc (modified)
	* branches/network_merged/src/lib/network/network_manager.h (modified)
	* branches/network_merged/src/lib/network/network_protocol.cc (modified)
	* branches/network_merged/src/lib/network/network_protocol.h (modified)
	* branches/network_merged/src/lib/network/network_socket.cc (modified)
	* branches/network_merged/src/lib/network/network_stream.cc (modified)
	* branches/network_merged/src/lib/network/network_stream.h (modified)
	* branches/network_merged/src/lib/network/synchronizeable.cc (modified)
	* branches/network_merged/src/lib/network/synchronizeable.h (modified)
	* branches/network_merged/src/story_entities/network_world.cc (modified)
	* branches/network_merged/src/subprojects/network/Makefile.am (modified)
	* branches/network_merged/src/subprojects/network/network_unit_test.cc (modified)
	* branches/network_merged/src/subprojects/network/read_sync.cc (modified)
	* branches/network_merged/src/subprojects/network/read_sync.h (modified)
	* branches/network_merged/src/subprojects/network/simple_sync.cc (modified)
	* branches/network_merged/src/subprojects/network/simple_sync.h (modified)
	* branches/network_merged/src/subprojects/network/write_sync.cc (modified)
	* branches/network_merged/src/subprojects/network/write_sync.h (modified)
	* branches/network_merged/src/util/loading/factory.cc (modified)
	* branches/network_merged/src/util/loading/factory.h (modified)
	* branches/network_merged/src/world_entities/npcs/npc.cc (modified)
	* branches/network_merged/src/world_entities/npcs/npc.h (modified)
	* branches/network_merged/src/world_entities/skybox.cc (modified)
	* branches/network_merged/src/world_entities/skybox.h (modified)
	* branches/network_merged/src/world_entities/space_ships/space_ship.cc (modified)
	* branches/network_merged/src/world_entities/terrain.cc (modified)
	* branches/network_merged/src/world_entities/terrain.h (modified)
	* branches/network_merged/src/world_entities/weapons/ground_turret.cc (modified)
	* branches/network_merged/src/world_entities/weapons/ground_turret.h (modified)
	* branches/network_merged/src/world_entities/world_entity.cc (modified)
	* branches/network_merged/src/world_entities/world_entity.h (modified)

	orxonox/branches/newtork: merged the network branche for merging to ...


Fri, 30 Dec 2005 00:33:42 GMT bensch [6338]
	* branches/network_merged (copied)

	orxonox/branchs: added new branche network_merged to merge the trunk ...


Sun, 25 Dec 2005 15:21:48 GMT bensch [6282]
	* trunk/src/lib/lang/base_object.cc (modified)
	* trunk/src/world_entities/extendable.h (modified)
	* trunk/src/world_entities/power_ups/power_up.cc (modified)
	* trunk/src/world_entities/power_ups/power_up.h (modified)

	orxonox/trunk: merged the PowerUps back here