Changes

Summary

1. Dialogue merged without core modifications
2. reverted merge Dialogue

Revision 11451 by patricwi: Dialogue merged without core modifications
Change Type	Path in Repository	Path in Workspace
	/code/trunk (diff)	.
	/code/trunk/data/gui/layouts/Dialogue.layout	data/gui/layouts/Dialogue.layout
	/code/trunk/data/gui/scripts/Dialogue.lua	data/gui/scripts/Dialogue.lua
	/code/trunk/data/gui/scripts/TestDialogButttons.lua	data/gui/scripts/TestDialogButttons.lua
	/code/trunk/data/levels/DialogueShowcase.oxw	data/levels/DialogueShowcase.oxw
	/code/trunk/data/levels/events.oxw (diff)	data/levels/events.oxw
	/code/trunk/data/overlays/HUDTemplates3.oxo (diff)	data/overlays/HUDTemplates3.oxo
	/code/trunk/src/modules/CMakeLists.txt (diff)	src/modules/CMakeLists.txt
	/code/trunk/src/modules/dialogue	src/modules/dialogue
Revision 11450 by patricwi: reverted merge Dialogue
Change Type	Path in Repository	Path in Workspace
	/code/trunk (diff)	.
	/code/trunk/data/gui/layouts/Dialogue.layout	data/gui/layouts/Dialogue.layout
	/code/trunk/data/gui/scripts/Dialogue.lua	data/gui/scripts/Dialogue.lua
	/code/trunk/data/gui/scripts/TestDialogButttons.lua	data/gui/scripts/TestDialogButttons.lua
	/code/trunk/data/levels/DialogueShowcase.oxw	data/levels/DialogueShowcase.oxw
	/code/trunk/data/levels/events.oxw (diff)	data/levels/events.oxw
	/code/trunk/data/overlays/HUDTemplates3.oxo (diff)	data/overlays/HUDTemplates3.oxo
	/code/trunk/data/tcl/core	data/tcl/core
	/code/trunk/src/modules/CMakeLists.txt (diff)	src/modules/CMakeLists.txt
	/code/trunk/src/modules/dialogue	src/modules/dialogue