#
# ChangeLog for code/branches/cegui0.8_ogre1.9/README
#
# Generated by Trac 1.0.9
# Nov 23, 2024, 7:58:05 AM

Tue, 20 Feb 2018 20:23:01 GMT landauf [11787]
	* code/branches/cegui0.8_ogre1.9 (copied)

	created new branch to merge cegui0.8 and ogre1.9 with the recent ...


Thu, 09 Mar 2017 13:46:20 GMT patricwi [11353]
	* code/trunk (modified)
	* code/trunk/README (modified)
	* code/trunk/data/defaultConfig/keybindings.ini (modified)
	* code/trunk/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/trunk/data/overlays/HUDTemplates3.oxo (modified)
	* code/trunk/data/overlays/HUDTemplatesFPS.oxo (modified)
	* code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified)
	* code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/trunk/src/modules/overlays/hud/HUDPickupItem.cc (copied)
	* code/trunk/src/modules/overlays/hud/HUDPickupItem.h (copied)
	* code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (copied)
	* code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (copied)
	* code/trunk/src/modules/pickup/CMakeLists.txt (modified)
	* code/trunk/src/modules/pickup/PickupManager.cc (modified)
	* code/trunk/src/modules/pickup/PickupManager.h (modified)
	* code/trunk/src/modules/pickup/items/SpeedPickup.h (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/controllers/HumanController.h (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.h (modified)
	* code/trunk/src/orxonox/interfaces/Pickupable.h (modified)

	merged HUD branch to trunk