#
# ChangeLog for code/branches/levelMichael/src/modules
#
# Generated by Trac 1.0.9
# Jul 27, 2025, 9:58:47 PM

Mon, 25 Nov 2013 15:10:21 GMT jo [9823]
	* code/branches/levelMichael (modified)
	* code/branches/levelMichael/cmake/LibraryConfig.cmake (modified)
	* code/branches/levelMichael/data/gui/layouts/SingleplayerMenu.layout (modified)
	* code/branches/levelMichael/data/levels/gallery.oxw (modified)
	* code/branches/levelMichael/data/levels/includes/weaponSettingsEscort.oxi (modified)
	* code/branches/levelMichael/data/levels/templates/lodInformation.oxt (modified)
	* code/branches/levelMichael/src/libraries/core/GUIManager.cc (modified)
	* code/branches/levelMichael/src/libraries/util/CMakeLists.txt (modified)
	* code/branches/levelMichael/src/modules/tetris/TetrisBrick.cc (modified)

	merging latest trunk into branch 'levelMichael'


Mon, 07 Oct 2013 12:51:35 GMT jo [9696]
	* code/branches/levelMichael (copied)

	Creating new PPS branch.


Thu, 26 Sep 2013 21:03:33 GMT landauf [9675]
	* code/trunk (modified)
	* code/trunk/cmake/tools/FindCEGUI.cmake (modified)
	* code/trunk/src/OrxonoxConfig.h.in (modified)
	* code/trunk/src/libraries/core/CorePrereqs.h (modified)
	* code/trunk/src/libraries/core/GUIManager.cc (modified)
	* code/trunk/src/libraries/core/GUIManager.h (modified)
	* code/trunk/src/libraries/core/GraphicsManager.cc (modified)
	* code/trunk/src/libraries/core/GraphicsManager.h (modified)
	* code/trunk/src/libraries/core/Resource.cc (modified)
	* code/trunk/src/libraries/util/Exception.cc (modified)
	* code/trunk/src/modules/objects/Planet.cc (modified)
	* code/trunk/src/orxonox/chat/ChatInputHandler.cc (modified)
	* code/trunk/src/orxonox/chat/ChatInputHandler.h (modified)
	* code/trunk/src/orxonox/graphics/Model.cc (modified)

	merged branch 'libs' back to trunk. orxonox now compiles and runs ...