#
# ChangeLog for code/branches/presentationHS14merge/src/OrxonoxConfig.h.in
#
# Generated by Trac 1.0.9
# Dec 24, 2024, 5:29:10 PM

Sun, 01 Feb 2015 12:51:57 GMT landauf [10222]
	* code/branches/presentationHS14merge (copied)

	created new branch to merge the changes from HS14


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