#
# ChangeLog for code/branches/masterserver2/data/defaultConfig
#
# Generated by Trac 1.0.9
# Nov 16, 2024, 2:40:44 AM

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

	creating new masterserver2 branch


Wed, 13 Oct 2010 09:35:18 GMT dafrick [7533]
	* code/trunk/data/defaultConfig/keybindings.ini (modified)
	* code/trunk/src/modules/pickup/CollectiblePickup.h (modified)
	* code/trunk/src/modules/pickup/DroppedPickup.h (modified)
	* code/trunk/src/modules/pickup/Pickup.cc (modified)
	* code/trunk/src/modules/pickup/Pickup.h (modified)
	* code/trunk/src/modules/pickup/PickupCollection.cc (modified)
	* code/trunk/src/modules/pickup/PickupCollection.h (modified)
	* code/trunk/src/modules/pickup/PickupCollectionIdentifier.cc (modified)
	* code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (modified)
	* code/trunk/src/modules/pickup/PickupManager.cc (modified)
	* code/trunk/src/modules/pickup/PickupManager.h (modified)
	* code/trunk/src/modules/pickup/PickupRepresentation.cc (modified)
	* code/trunk/src/modules/pickup/items/MetaPickup.cc (modified)
	* code/trunk/src/modules/pickup/items/MetaPickup.h (modified)
	* code/trunk/src/orxonox/controllers/HumanController.cc (modified)
	* code/trunk/src/orxonox/controllers/HumanController.h (modified)
	* code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	Documenting in pickups module.
	Cleaning up in PickupManager. ...