#
# ChangeLog for code/branches/Presentation_HS17_merge/src/modules/dialog/CMakeLists.txt
#
# Generated by Trac 1.0.9
# Aug 17, 2024, 4:02:04 AM

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


Thu, 30 Nov 2017 08:33:27 GMT kuchlert [11611]
	* code/branches/Dialog_HS17/src/modules/dialog/Answer.cc (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/Answer.h (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/AnswerId.cc (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/AnswerId.h (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/CMakeLists.txt (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/Dialog.cc (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/Dialog.h (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/DialogManager.cc (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/DialogManager.h (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/DialogPrereqs.h (added)
	* code/branches/Dialog_HS17/src/modules/dialog/Question.cc (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/Question.h (modified)

	fixed addQuestion and addAnswer in Dialog