#
# ChangeLog for branches/cd_merge/src/world_entities/playable.cc in orxonox.OLD
#
# Generated by Trac 1.0.9
# Jun 10, 2024, 1:34:46 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


Wed, 18 Jan 2006 15:41:57 GMT bensch [6589]
	* trunk/src/world_entities/playable.cc (modified)
	* trunk/src/world_entities/power_ups/power_up.cc (modified)
	* trunk/src/world_entities/power_ups/power_up.h (modified)
	* trunk/src/world_entities/power_ups/weapon_power_up.cc (modified)
	* trunk/src/world_entities/weapons/turret.cc (modified)

	TRUNK: merged powerups back