#
# ChangeLog for code/branches/dockingsystem2/src/modules/docking/Dock.h
#
# Generated by Trac 1.0.9
# Jul 6, 2024, 1:51:24 PM

Wed, 06 Apr 2011 14:39:29 GMT dafrick [8196]
	* code/branches/dockingsystem2 (modified)
	* code/branches/dockingsystem2/data/levels/docking.oxw (copied)
	* code/branches/dockingsystem2/src/modules/CMakeLists.txt (modified)
	* code/branches/dockingsystem2/src/modules/docking (copied)
	* code/branches/dockingsystem2/src/modules/docking/CMakeLists.txt (copied)
	* code/branches/dockingsystem2/src/modules/docking/Dock.cc (copied)
	* code/branches/dockingsystem2/src/modules/docking/Dock.h (copied)
	* code/branches/dockingsystem2/src/modules/docking/DockToShip.cc (copied)
	* code/branches/dockingsystem2/src/modules/docking/DockToShip.h (copied)
	* code/branches/dockingsystem2/src/modules/docking/DockingEffect.cc (copied)
	* code/branches/dockingsystem2/src/modules/docking/DockingEffect.h (copied)
	* code/branches/dockingsystem2/src/modules/docking/DockingPrecompiledHeaders.h (copied)
	* code/branches/dockingsystem2/src/modules/docking/DockingPrereqs.h (copied)
	* code/branches/dockingsystem2/src/orxonox/infos/HumanPlayer.h (modified)
	* code/branches/dockingsystem2/src/orxonox/infos/PlayerInfo.cc (modified)

	Merging old dockingsystem branch into new one.
	Do
	svn switch ...


Mon, 04 Apr 2011 13:12:49 GMT sven [8185]
	* code/branches/dockingsystem/data/levels/docking.oxw (modified)
	* code/branches/dockingsystem/src/modules/docking/Dock.cc (modified)
	* code/branches/dockingsystem/src/modules/docking/Dock.h (modified)
	* code/branches/dockingsystem/src/modules/docking/DockToShip.cc (modified)
	* code/branches/dockingsystem/src/modules/docking/DockToShip.h (modified)
	* code/branches/dockingsystem/src/modules/docking/DockingEffect.cc (modified)
	* code/branches/dockingsystem/src/modules/docking/DockingEffect.h (modified)
	* code/branches/dockingsystem/src/modules/docking/DockingPrereqs.h (modified)
	* code/branches/dockingsystem/src/orxonox/infos/PlayerInfo.cc (modified)

	DockToShip and some fixes