#
# ChangeLog for trunk/src/world_entities/cameraman.h in orxonox.OLD
#
# Generated by Trac 1.0.9
# Jun 8, 2024, 6:43:30 PM

Fri, 26 Jan 2007 09:58:31 GMT patrick [10379]
	* 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/menu/game_menu.cc (modified)
	* trunk/src/util/state.cc (modified)
	* trunk/src/util/state.h (modified)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/WorldEntities.am (modified)
	* trunk/src/world_entities/blackscreen.cc (copied)
	* trunk/src/world_entities/blackscreen.h (copied)
	* trunk/src/world_entities/camera.cc (modified)
	* trunk/src/world_entities/camera.h (modified)
	* trunk/src/world_entities/cameraman.cc (copied)
	* trunk/src/world_entities/cameraman.h (copied)
	* trunk/src/world_entities/targets.h (copied)
	* trunk/src/world_entities/test_entity.h (modified)

	merged branche camera to trunk. resolved many conflicts as in the ...


Wed, 24 Jan 2007 17:55:15 GMT gfilip [10348]
	* branches/camera/src/world_entities/blackscreen.cc (modified)
	* branches/camera/src/world_entities/camera.cc (modified)
	* branches/camera/src/world_entities/cameraman.cc (modified)
	* branches/camera/src/world_entities/cameraman.h (modified)
	* branches/camera/src/world_entities/test_entity.cc (modified)

	new