#
# ChangeLog for branches/cd_merge/src/lib/sound in orxonox.OLD
#
# Generated by Trac 1.0.9
# May 23, 2024, 9:24:15 PM

Mon, 23 Jan 2006 13:05:50 GMT bensch [6656]
	* branches/cd_merge (copied)

	copy of the Trunk as a new copy of the trunk


Sat, 21 Jan 2006 00:18:19 GMT bensch [6634]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/coord/p_node.cc (modified)
	* trunk/src/lib/coord/p_node.h (modified)
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/lib/graphics/importer/texture.cc (modified)
	* trunk/src/lib/lang/base_object.cc (modified)
	* trunk/src/lib/network/converter.cc (modified)
	* trunk/src/lib/network/converter.h (modified)
	* trunk/src/lib/network/network_game_manager.cc (modified)
	* trunk/src/lib/network/network_game_manager.h (modified)
	* trunk/src/lib/network/network_socket.cc (modified)
	* trunk/src/lib/network/network_stream.cc (modified)
	* trunk/src/lib/network/network_stream.h (modified)
	* trunk/src/lib/sound/sound_source.h (modified)
	* trunk/src/story_entities/Makefile.am (modified)
	* trunk/src/story_entities/campaign_data.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world_data.cc (modified)
	* trunk/src/story_entities/game_world_data.h (modified)
	* trunk/src/story_entities/multi_player_world_data.cc (modified)
	* trunk/src/story_entities/simple_game_menu.cc (copied)
	* trunk/src/story_entities/simple_game_menu.h (copied)
	* trunk/src/story_entities/story_entity.h (modified)
	* trunk/src/subprojects/network/Makefile.am (modified)
	* trunk/src/subprojects/network/isolated_unit_test.cc (copied)
	* trunk/src/subprojects/network/isolated_unit_test.h (copied)
	* trunk/src/subprojects/network/read_sync.cc (modified)
	* trunk/src/subprojects/network/simple_sync.cc (modified)
	* trunk/src/subprojects/network/write_sync.cc (modified)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/image_entity.cc (copied)
	* trunk/src/world_entities/image_entity.h (copied)
	* trunk/src/world_entities/planet.cc (copied)
	* trunk/src/world_entities/planet.h (copied)
	* trunk/src/world_entities/skybox.cc (modified)
	* trunk/src/world_entities/skybox.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.h (modified)
	* trunk/src/world_entities/world_entity.cc (modified)

	orxonox/trunk: merged the network-branche back to the trunk

	merged ...