#
# ChangeLog for code/branches/presentation2/cmake
#
# Generated by Trac 1.0.9
# Nov 22, 2024, 10:21:30 AM

Sun, 22 Nov 2009 15:25:02 GMT rgrieder [6120]
	* code/branches/presentation2/cmake/PrecompiledHeaderFiles.cmake (modified)
	* code/branches/presentation2/cmake/SourceFileUtilities.cmake (modified)
	* code/branches/presentation2/data/overlays/stats.oxo (modified)
	* code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (modified)

	Found some tabs


Fri, 20 Nov 2009 16:13:48 GMT rgrieder [6106]
	* code/branches/presentation2 (copied)

	Created merger branch for the HS09 presentation.


Fri, 20 Nov 2009 15:55:40 GMT rgrieder [6105]
	* code/trunk (modified)
	* code/trunk/cmake/CompilerConfigMSVC.cmake (modified)
	* code/trunk/src/libraries/core/CMakeLists.txt (modified)
	* code/trunk/src/libraries/core/ConfigFileManager.h (modified)
	* code/trunk/src/libraries/core/ConfigValueIncludes.h (modified)
	* code/trunk/src/libraries/core/ConsoleCommandCompilation.cc (modified)
	* code/trunk/src/libraries/core/Core.cc (modified)
	* code/trunk/src/libraries/core/Core.h (modified)
	* code/trunk/src/libraries/core/CorePrereqs.h (modified)
	* code/trunk/src/libraries/core/GUIManager.cc (modified)
	* code/trunk/src/libraries/core/GraphicsManager.cc (modified)
	* code/trunk/src/libraries/core/GraphicsManager.h (modified)
	* code/trunk/src/libraries/core/IOConsole.cc (copied)
	* code/trunk/src/libraries/core/IOConsole.h (copied)
	* code/trunk/src/libraries/core/LuaState.cc (modified)
	* code/trunk/src/libraries/core/OrxonoxClass.cc (modified)
	* code/trunk/src/libraries/core/OrxonoxClass.h (modified)
	* code/trunk/src/libraries/core/PathConfig.cc (modified)
	* code/trunk/src/libraries/core/Shell.cc (modified)
	* code/trunk/src/libraries/core/Shell.h (modified)
	* code/trunk/src/libraries/core/input/InputBuffer.cc (modified)
	* code/trunk/src/libraries/core/input/InputBuffer.h (modified)
	* code/trunk/src/libraries/core/input/InputHandler.h (modified)
	* code/trunk/src/libraries/core/input/InputManager.cc (modified)
	* code/trunk/src/libraries/network/packet/Packet.cc (modified)
	* code/trunk/src/libraries/tools/ResourceCollection.h (modified)
	* code/trunk/src/libraries/util/CMakeLists.txt (modified)
	* code/trunk/src/libraries/util/Debug.h (modified)
	* code/trunk/src/libraries/util/OrxAssert.h (modified)
	* code/trunk/src/libraries/util/OutputBuffer.cc (deleted)
	* code/trunk/src/libraries/util/OutputBuffer.h (deleted)
	* code/trunk/src/libraries/util/OutputHandler.cc (modified)
	* code/trunk/src/libraries/util/OutputHandler.h (modified)
	* code/trunk/src/libraries/util/UtilPrereqs.h (modified)
	* code/trunk/src/orxonox/Main.cc (modified)
	* code/trunk/src/orxonox/gamestates/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/gamestates/GSClient.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSDedicated.h (deleted)
	* code/trunk/src/orxonox/gamestates/GSDedicatedClient.h (deleted)
	* code/trunk/src/orxonox/gamestates/GSIOConsole.cc (deleted)
	* code/trunk/src/orxonox/gamestates/GSIOConsole.h (deleted)
	* code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSServer.cc (modified)
	* code/trunk/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/trunk/src/orxonox/overlays/InGameConsole.h (modified)

	Merged console branch back to trunk.