#
# ChangeLog for code/branches/Presentation_HS17_merge
#
# Generated by Trac 1.0.9
# Nov 22, 2024, 5:30:37 AM

Sat, 10 Feb 2018 23:26:40 GMT landauf [11725]
	* code/branches/Presentation_HS17_merge (modified)
	* code/branches/Presentation_HS17_merge/data/levels/Asteroids2D.oxw (copied)
	* code/branches/Presentation_HS17_merge/data/levels/includes/asteroids2DWeapon.oxi (copied)
	* code/branches/Presentation_HS17_merge/data/levels/templates/asteroidsAsteroids2D.oxt (copied)
	* code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipAsteroids2D.oxt (copied)
	* code/branches/Presentation_HS17_merge/data/overlays/Asteroids2DHUD.oxo (copied)
	* code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroids2D (copied)

	merged Asteroid_HS17


Sat, 10 Feb 2018 23:24:16 GMT landauf [11724]
	* code/branches/Presentation_HS17_merge/src/modules/pickup/PickupPrereqs.h (modified)

	fixed compiler warning


Sat, 10 Feb 2018 23:00:43 GMT landauf [11723]
	* code/branches/Presentation_HS17_merge (copied)

	created new branch to merge HS17 projects back to trunk


Sat, 10 Feb 2018 00:02:18 GMT landauf [11722]
	* code/trunk/data/levels/StoryModeMap.oxw (modified)
	* code/trunk/data/levels/templates/StoryMode.oxt (modified)

	[StoryModeMap_HS16] fixed warnings in console