#
# ChangeLog for branches/water in orxonox.OLD
#
# Generated by Trac 1.0.9
# Dec 14, 2024, 12:15:38 AM

Thu, 22 Jun 2006 13:49:22 GMT stefalie [8729]
	* branches/water/src/world_entities/environments/mapped_water.cc (modified)
	* branches/water/src/world_entities/environments/mapped_water.h (modified)

	water: quite everything works...


Thu, 22 Jun 2006 12:13:57 GMT bensch [8721]
	* branches/water (copied)

	new copy


Thu, 22 Jun 2006 12:13:18 GMT bensch [8719]
	* trunk/src/story_entities/menu/game_menu.cc (modified)
	* trunk/src/world_entities/environments/mapped_water.cc (modified)
	* trunk/src/world_entities/environments/mapped_water.h (modified)
	* trunk/src/world_entities/space_ships/hover.cc (modified)

	merged the water branche back. conflicts resolved in favour of the
	trunk