#
# ChangeLog for code/branches/presentation/src/modules/CMakeLists.txt
#
# Generated by Trac 1.0.9
# Jun 11, 2024, 6:25:52 AM

Fri, 27 May 2011 21:09:00 GMT dafrick [8631]
	* code/branches/presentation (modified)
	* code/branches/presentation/data/levels/spaceRace.oxw (copied)
	* code/branches/presentation/src/modules/CMakeLists.txt (modified)
	* code/branches/presentation/src/modules/gametypes (copied)
	* code/branches/presentation/src/modules/gametypes/CMakeLists.txt (copied)
	* code/branches/presentation/src/modules/gametypes/GametypesPrecompiledHeaders.h (copied)
	* code/branches/presentation/src/modules/gametypes/GametypesPrereqs.h (copied)
	* code/branches/presentation/src/modules/gametypes/RaceCheckPoint.cc (copied)
	* code/branches/presentation/src/modules/gametypes/RaceCheckPoint.h (copied)
	* code/branches/presentation/src/modules/gametypes/SpaceRace.cc (copied)
	* code/branches/presentation/src/modules/gametypes/SpaceRace.h (copied)
	* code/branches/presentation/src/orxonox/gametypes/Gametype.cc (modified)

	Merging spacerace branch into presentation branch.


Tue, 24 May 2011 19:24:39 GMT dafrick [8564]
	* code/branches/presentation (modified)
	* code/branches/presentation/data/levels/tetris.oxw (copied)
	* code/branches/presentation/src/modules/CMakeLists.txt (modified)
	* code/branches/presentation/src/modules/pong/PongBat.h (modified)
	* code/branches/presentation/src/modules/tetris (copied)
	* code/branches/presentation/src/modules/tetris/CMakeLists.txt (copied)
	* code/branches/presentation/src/modules/tetris/Tetris.cc (copied)
	* code/branches/presentation/src/modules/tetris/Tetris.h (copied)
	* code/branches/presentation/src/modules/tetris/TetrisCenterpoint.cc (copied)
	* code/branches/presentation/src/modules/tetris/TetrisCenterpoint.h (copied)
	* code/branches/presentation/src/modules/tetris/TetrisPrereqs.h (copied)
	* code/branches/presentation/src/modules/tetris/TetrisStone.cc (copied)
	* code/branches/presentation/src/modules/tetris/TetrisStone.h (copied)

	Merging tetris branch into presentation branch.


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.


Wed, 18 May 2011 08:57:00 GMT dafrick [8499]
	* code/branches/presentation (copied)

	Creating new presentation branch.


Thu, 12 May 2011 11:51:18 GMT FelixSchulthess [8457]
	* code/trunk (modified)
	* code/trunk/data/levels/portals.oxw (copied)
	* code/trunk/src/modules/CMakeLists.txt (modified)
	* code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified)
	* code/trunk/src/modules/portals (copied)
	* code/trunk/src/modules/portals/CMakeLists.txt (copied)
	* code/trunk/src/modules/portals/PortalEndPoint.cc (copied)
	* code/trunk/src/modules/portals/PortalEndPoint.h (copied)
	* code/trunk/src/modules/portals/PortalLink.cc (copied)
	* code/trunk/src/modules/portals/PortalLink.h (copied)
	* code/trunk/src/modules/portals/PortalsPrecompiledHeaders.h (copied)
	* code/trunk/src/modules/portals/PortalsPrereqs.h (copied)

	merged portals branch into trunk