#
# ChangeLog for code/branches/masterserver2/src/orxonox/items/MultiStateEngine.cc
#
# Generated by Trac 1.0.9
# Sep 17, 2024, 7:36:08 PM

Fri, 04 Mar 2011 10:32:51 GMT scheusso [8016]
	* code/branches/masterserver2 (copied)

	creating new masterserver2 branch


Tue, 13 Apr 2010 07:32:08 GMT dafrick [6709]
	* code/trunk (modified)
	* code/trunk/data/levels/includes/pickups_speed.oxi (copied)
	* code/trunk/data/levels/pickup_ppstest1.oxw (copied)
	* code/trunk/data/levels/templates/pickup_representation_templates_speed.oxt (copied)
	* code/trunk/src/modules/pickup/Pickup.cc (modified)
	* code/trunk/src/modules/pickup/Pickup.h (modified)
	* code/trunk/src/modules/pickup/PickupPrereqs.h (modified)
	* code/trunk/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/trunk/src/modules/pickup/items/HealthPickup.cc (modified)
	* code/trunk/src/modules/pickup/items/HealthPickup.h (modified)
	* code/trunk/src/modules/pickup/items/MetaPickup.cc (modified)
	* code/trunk/src/modules/pickup/items/MetaPickup.h (modified)
	* code/trunk/src/modules/pickup/items/SpeedPickup.cc (copied)
	* code/trunk/src/modules/pickup/items/SpeedPickup.h (copied)
	* code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified)
	* code/trunk/src/orxonox/items/Engine.cc (modified)
	* code/trunk/src/orxonox/items/Engine.h (modified)
	* code/trunk/src/orxonox/items/MultiStateEngine.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	Merged ppspickups1 into trunk.