#
# ChangeLog for branches/powerups in orxonox.OLD
#
# Generated by Trac 1.0.9
# Nov 30, 2024, 4:00:21 PM

Wed, 18 Jan 2006 13:15:10 GMT bensch [6550]
	* branches/powerups (copied)

	branches: copy of the trunk


Wed, 18 Jan 2006 13:12:53 GMT bensch [6547]
	* trunk/src/world_entities/playable.cc (modified)
	* trunk/src/world_entities/playable.h (modified)
	* trunk/src/world_entities/power_ups/param_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/param_power_up.h (modified)
	* trunk/src/world_entities/power_ups/power_up.cc (modified)
	* trunk/src/world_entities/power_ups/weapon_power_up.cc (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/weapons/turret.cc (modified)

	orxonox/trunk: merged the WeaponManager back to the trunk