#
# ChangeLog for code/branches/presentation/src/modules/docking/DockingTarget.cc
#
# Generated by Trac 1.0.9
# May 30, 2024, 4:19:48 PM

Tue, 24 May 2011 14:44:39 GMT dafrick [8561]
	* code/branches/presentation (modified)
	* code/branches/presentation/data/gui/layouts/DockingDialog.layout (copied)
	* code/branches/presentation/data/gui/scripts/DockingDialog.lua (copied)
	* code/branches/presentation/data/levels/docking.oxw (copied)
	* code/branches/presentation/src/modules/CMakeLists.txt (modified)
	* code/branches/presentation/src/modules/docking (copied)
	* code/branches/presentation/src/modules/docking/CMakeLists.txt (copied)
	* code/branches/presentation/src/modules/docking/Dock.cc (copied)
	* code/branches/presentation/src/modules/docking/Dock.h (copied)
	* code/branches/presentation/src/modules/docking/DockToShip.cc (copied)
	* code/branches/presentation/src/modules/docking/DockToShip.h (copied)
	* code/branches/presentation/src/modules/docking/DockingAnimation.cc (copied)
	* code/branches/presentation/src/modules/docking/DockingAnimation.h (copied)
	* code/branches/presentation/src/modules/docking/DockingController.cc (copied)
	* code/branches/presentation/src/modules/docking/DockingController.h (copied)
	* code/branches/presentation/src/modules/docking/DockingEffect.cc (copied)
	* code/branches/presentation/src/modules/docking/DockingEffect.h (copied)
	* code/branches/presentation/src/modules/docking/DockingPrecompiledHeaders.h (copied)
	* code/branches/presentation/src/modules/docking/DockingPrereqs.h (copied)
	* code/branches/presentation/src/modules/docking/DockingTarget.cc (copied)
	* code/branches/presentation/src/modules/docking/DockingTarget.h (copied)
	* code/branches/presentation/src/modules/docking/MoveToDockingTarget.cc (copied)
	* code/branches/presentation/src/modules/docking/MoveToDockingTarget.h (copied)
	* code/branches/presentation/src/modules/objects/triggers/MultiTrigger.cc (modified)
	* code/branches/presentation/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentation/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/presentation/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/branches/presentation/src/orxonox/infos/PlayerInfo.h (modified)

	Merging dockingsystem2 branch to presentation branch.


Tue, 24 May 2011 14:33:48 GMT dafrick [8560]
	* code/branches/dockingsystem2/data/levels/docking.oxw (modified)
	* code/branches/dockingsystem2/src/modules/docking/Dock.cc (modified)
	* code/branches/dockingsystem2/src/modules/docking/DockToShip.cc (modified)
	* code/branches/dockingsystem2/src/modules/docking/DockingController.cc (modified)
	* code/branches/dockingsystem2/src/modules/docking/DockingTarget.cc (modified)

	Some cleanup.