#
# ChangeLog for code/branches/menu/src
#
# Generated by Trac 1.0.9
# Nov 15, 2024, 4:12:23 AM

Wed, 04 Nov 2009 13:14:53 GMT scheusso [6024]
	* code/branches/menu (modified)
	* code/branches/menu/data/gui/layouts/InGameMenu.layout (copied)
	* code/branches/menu/data/gui/layouts/MainMenu.layout (modified)
	* code/branches/menu/data/gui/layouts/QuestGUI.layout (modified)
	* code/branches/menu/data/gui/scripts/InGameMenu.lua (copied)
	* code/branches/menu/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/branches/menu/data/gui/scripts/MainMenu.lua (modified)
	* code/branches/menu/src/libraries/core/CMakeLists.txt (modified)
	* code/branches/menu/src/libraries/core/GUIManager.cc (modified)
	* code/branches/menu/src/libraries/core/GUIManager.h (modified)
	* code/branches/menu/src/libraries/core/Game.h (modified)
	* code/branches/menu/src/libraries/core/LuaState.cc (modified)
	* code/branches/menu/src/modules/overlays/GUIOverlay.cc (modified)
	* code/branches/menu/src/orxonox/gamestates/GSGraphics.cc (modified)
	* code/branches/menu/src/orxonox/gamestates/GSGraphics.h (modified)
	* code/branches/menu/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/menu/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/branches/menu/src/orxonox/pickup/PickupInventory.cc (modified)
	* code/branches/menu/src/orxonox/pickup/PickupSpawner.cc (modified)

	merged ingamemenu branch to menu branch


Wed, 14 Oct 2009 11:14:15 GMT rgrieder [5944]
	* code/branches/menu (copied)

	Recreating menu branch.


Wed, 14 Oct 2009 09:33:13 GMT rgrieder [5940]
	* code/trunk/src/libraries/core/MemoryArchive.cc (modified)

	Fixed boost v1.36 build.