#
# ChangeLog for code/branches/presentationFS15merge/src/orxonox/gametypes/TeamDeathmatch.cc
#
# Generated by Trac 1.0.9
# Jun 9, 2024, 5:32:31 PM

Sun, 27 Sep 2015 10:11:43 GMT landauf [10595]
	* code/branches/presentationFS15merge (copied)

	created new branch to merge all branches from FS15 in a clean way


Sun, 29 Dec 2013 19:06:44 GMT jo [9941]
	* code/trunk/data/gui/layouts/CreditsMenu.layout (modified)
	* code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified)
	* code/trunk/data/levels/missionOne.oxw (modified)
	* code/trunk/data/levels/underAttack.oxw (modified)
	* code/trunk/src/modules/objects/SpaceBoundaries.cc (modified)
	* code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified)
	* code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified)
	* code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified)
	* code/trunk/src/orxonox/gametypes/TeamGametype.cc (modified)
	* code/trunk/src/orxonox/gametypes/TeamGametype.h (modified)
	* code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified)
	* code/trunk/src/orxonox/gametypes/UnderAttack.h (modified)

	Adding most of the  changes that were proposed in the release2012
	branch.