#
# ChangeLog for code/branches/presentationHS14merge/data/levels/underAttack.oxw
#
# Generated by Trac 1.0.9
# May 17, 2024, 10:50:33 PM

Sun, 01 Feb 2015 12:51:57 GMT landauf [10222]
	* code/branches/presentationHS14merge (copied)

	created new branch to merge the changes from HS14


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.