#
# ChangeLog for code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt
#
# Generated by Trac 1.0.9
# Jun 3, 2024, 7:45:11 PM

Thu, 15 Feb 2018 21:28:52 GMT landauf [11747]
	* code/branches/Presentation_HS17_merge (modified)
	* code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout (copied)
	* code/branches/Presentation_HS17_merge/data/gui/layouts/Dialogue.layout (deleted)
	* code/branches/Presentation_HS17_merge/data/gui/scripts/Dialog.lua (copied)
	* code/branches/Presentation_HS17_merge/data/gui/scripts/Dialogue.lua (deleted)
	* code/branches/Presentation_HS17_merge/data/levels/DialogShowcase.oxw (copied)
	* code/branches/Presentation_HS17_merge/data/levels/DialogueShowcase.oxw (deleted)
	* code/branches/Presentation_HS17_merge/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17_merge/src/modules/dialog (copied)
	* code/branches/Presentation_HS17_merge/src/modules/dialogue (deleted)

	merged Dialog_HS17


Sun, 11 Feb 2018 15:52:54 GMT landauf [11730]
	* code/branches/Presentation_HS17_merge (modified)
	* code/branches/Presentation_HS17_merge/data/levels/AsteroidFarming.oxw (copied)
	* code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroidmining (copied)
	* code/branches/Presentation_HS17_merge/src/modules/pickup/Pickup.h (modified)
	* code/branches/Presentation_HS17_merge/src/modules/pickup/PickupSpawner.cc (modified)
	* code/branches/Presentation_HS17_merge/src/modules/pickup/PickupSpawner.h (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/Pawn.h (modified)

	merged AsteroidMining_HS17


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:00:43 GMT landauf [11723]
	* code/branches/Presentation_HS17_merge (copied)

	created new branch to merge HS17 projects back to trunk


Wed, 11 Oct 2017 14:11:29 GMT patricwi [11451]
	* code/trunk (modified)
	* code/trunk/data/gui/layouts/Dialogue.layout (copied)
	* code/trunk/data/gui/scripts/Dialogue.lua (copied)
	* code/trunk/data/gui/scripts/TestDialogButttons.lua (copied)
	* code/trunk/data/levels/DialogueShowcase.oxw (copied)
	* code/trunk/data/levels/events.oxw (modified)
	* code/trunk/data/overlays/HUDTemplates3.oxo (modified)
	* code/trunk/src/modules/CMakeLists.txt (modified)
	* code/trunk/src/modules/dialogue (copied)

	Dialogue merged without core modifications