#
# ChangeLog for code/branches/presentation3/src/modules/pickup/CMakeLists.txt
#
# Generated by Trac 1.0.9
# Jun 6, 2024, 7:56:14 PM

Wed, 09 Jun 2010 22:04:41 GMT rgrieder [7135]
	* code/branches/presentation3/cmake/TargetUtilities.cmake (modified)
	* code/branches/presentation3/src/external/ceguilua/CMakeLists.txt (modified)
	* code/branches/presentation3/src/external/ogreceguirenderer/CMakeLists.txt (modified)
	* code/branches/presentation3/src/external/ois/CMakeLists.txt (modified)
	* code/branches/presentation3/src/external/tolua/CMakeLists.txt (modified)
	* code/branches/presentation3/src/libraries/core/CMakeLists.txt (modified)
	* code/branches/presentation3/src/libraries/network/CMakeLists.txt (modified)
	* code/branches/presentation3/src/libraries/tools/CMakeLists.txt (modified)
	* code/branches/presentation3/src/libraries/util/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/designtools/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/objects/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/overlays/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/pickup/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/pong/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/questsystem/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/weapons/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/CMakeLists.txt (modified)

	Automatically handle DEFINE_SYMBOL for our own libraries.
	Also ...


Mon, 17 May 2010 13:31:49 GMT scheusso [6912]
	* code/branches/presentation3 (copied)

	creating new presentation merger branch


Tue, 13 Apr 2010 08:16:10 GMT dafrick [6711]
	* code/trunk (modified)
	* code/trunk/data/gui/layouts/PickupInventory.layout (modified)
	* code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (modified)
	* code/trunk/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/trunk/data/gui/scripts/PickupInventory.lua (modified)
	* code/trunk/data/gui/scripts/QuestGUI.lua (modified)
	* code/trunk/data/levels/includes/pickups.oxi (modified)
	* code/trunk/data/levels/pickup.oxw (modified)
	* code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified)
	* code/trunk/data/overlays/hudtemplates3.oxo (modified)
	* code/trunk/src/modules/pickup/CMakeLists.txt (modified)
	* code/trunk/src/modules/pickup/PickupManager.cc (modified)
	* code/trunk/src/modules/pickup/PickupManager.h (modified)
	* code/trunk/src/modules/pickup/PickupPrereqs.h (modified)
	* code/trunk/src/modules/pickup/PickupRepresentation.cc (modified)
	* code/trunk/src/modules/pickup/PickupRepresentation.h (modified)
	* code/trunk/src/modules/pickup/PickupSpawner.cc (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified)
	* 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/overlays/OrxonoxOverlay.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	Merged pickup4 branch back to trunk.