#
# ChangeLog for code/branches/presentationFS15merge/src/orxonox/chat
#
# Generated by Trac 1.0.9
# May 15, 2024, 9:52:41 PM

Sun, 27 Sep 2015 10:11:43 GMT landauf [10595]
	* code/branches/presentationFS15merge (copied)

	created new branch to merge all branches from FS15 in a clean way


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 ...