#
# ChangeLog for code/branches/dockingsystem2/data/overlays
#
# Generated by Trac 1.0.9
# Nov 26, 2024, 8:17:43 AM

Wed, 06 Apr 2011 14:26:26 GMT dafrick [8195]
	* code/branches/dockingsystem2 (copied)

	New dockingsystem branch, to avoid problems when merging it into
	trunk.


Sun, 03 Apr 2011 17:56:47 GMT jo [8178]
	* code/trunk (modified)
	* code/trunk/data/levels/lastManStanding.oxw (modified)
	* code/trunk/data/levels/lastTeamStanding.oxw (copied)
	* code/trunk/data/levels/lastTeamStandingII.oxw (copied)
	* code/trunk/data/overlays/lastManStandingHUD.oxo (modified)
	* code/trunk/data/overlays/lastTeamStandingHUD.oxo (copied)
	* code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/trunk/src/modules/overlays/hud/GametypeStatus.cc (modified)
	* code/trunk/src/modules/overlays/hud/GametypeStatus.h (modified)
	* code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.cc (copied)
	* code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.h (copied)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/gametypes/Gametype.h (modified)
	* code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (copied)
	* code/trunk/src/orxonox/gametypes/LastTeamStanding.h (copied)

	Merged lastmastanding3 into trunk. There's an xml parsing error that ...