#
# ChangeLog for code/branches/ois_update/src/libraries/core/GUIManager.cc
#
# Generated by Trac 1.0.9
# May 20, 2024, 8:16:19 AM

Fri, 03 Dec 2010 13:38:57 GMT dafrick [7719]
	* code/branches/ois_update/data/DefaultResources.oxr (modified)
	* code/branches/ois_update/src/libraries/core/GUIManager.cc (modified)
	* code/branches/ois_update/src/libraries/tools/ResourceLocation.cc (modified)

	Updating branch for changes in the data repository. Please also ...


Thu, 07 Oct 2010 18:12:14 GMT rgrieder [7505]
	* code/branches/ois_update (copied)




Sat, 11 Sep 2010 08:20:44 GMT dafrick [7403]
	* code/trunk (modified)
	* code/trunk/data/gui/layouts/NotificationLayer.layout (copied)
	* code/trunk/data/gui/scripts/GUISheet.lua (modified)
	* code/trunk/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified)
	* code/trunk/data/gui/scripts/NotificationLayer.lua (copied)
	* code/trunk/data/gui/scripts/SheetManager.lua (modified)
	* code/trunk/data/levels/Fight in our Back.oxw (modified)
	* code/trunk/data/levels/Quest_PirateAttack.oxw (modified)
	* code/trunk/data/levels/old/princessaeryn.oxw (modified)
	* code/trunk/data/levels/old/questsystem.oxw (modified)
	* code/trunk/data/levels/princessaeryn.oxw (modified)
	* code/trunk/data/levels/tutorial.oxw (modified)
	* code/trunk/src/libraries/core/GUIManager.cc (modified)
	* code/trunk/src/libraries/core/GUIManager.h (modified)
	* code/trunk/src/modules/notifications/CMakeLists.txt (modified)
	* code/trunk/src/modules/notifications/Notification.cc (modified)
	* code/trunk/src/modules/notifications/Notification.h (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified)
	* code/trunk/src/modules/notifications/NotificationDispatcher.h (modified)
	* code/trunk/src/modules/notifications/NotificationManager.cc (modified)
	* code/trunk/src/modules/notifications/NotificationManager.h (modified)
	* code/trunk/src/modules/notifications/NotificationOverlay.cc (deleted)
	* code/trunk/src/modules/notifications/NotificationOverlay.h (deleted)
	* code/trunk/src/modules/notifications/NotificationQueue.cc (modified)
	* code/trunk/src/modules/notifications/NotificationQueue.h (modified)
	* code/trunk/src/modules/notifications/NotificationsPrereqs.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified)
	* code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified)
	* code/trunk/src/modules/objects/triggers/MultiTriggerContainer.h (modified)
	* code/trunk/src/modules/questsystem/Quest.cc (modified)
	* code/trunk/src/modules/questsystem/QuestDescription.cc (modified)
	* code/trunk/src/modules/questsystem/QuestDescription.h (modified)
	* code/trunk/src/modules/questsystem/QuestHint.cc (modified)
	* code/trunk/src/modules/questsystem/QuestNotification.cc (modified)
	* code/trunk/src/modules/questsystem/QuestNotification.h (modified)
	* code/trunk/src/orxonox/interfaces/NotificationListener.h (modified)

	Merged notifications branch back to trunk.