#
# ChangeLog for branches/water in orxonox.OLD
#
# Generated by Trac 1.0.9
# Nov 14, 2024, 9:13:29 PM

Wed, 31 May 2006 14:54:10 GMT bensch [8041]
	* branches/water (copied)

	created new copy of the trunk


Wed, 31 May 2006 14:52:34 GMT bensch [8037]
	* trunk/src/lib/graphics/importer/material.cc (modified)
	* trunk/src/lib/graphics/importer/material.h (modified)
	* trunk/src/lib/graphics/shader.cc (modified)
	* trunk/src/lib/graphics/shader.h (modified)
	* trunk/src/lib/graphics/text_engine/text.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/util/object_manager.cc (modified)
	* trunk/src/world_entities/environments/mapped_water.cc (modified)
	* trunk/src/world_entities/environments/mapped_water.h (modified)
	* trunk/src/world_entities/skybox.cc (modified)
	* trunk/src/world_entities/terrain.cc (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	trunk: merged the water back
	merged with command
	svn merge ...