#
# ChangeLog for code/branches/merge/cmake
#
# Generated by Trac 1.0.9
# May 20, 2024, 10:37:20 AM

Tue, 13 May 2008 15:01:10 GMT scheusso [1264]
	* code/branches/merge/CMakeLists.txt (modified)
	* code/branches/merge/TODO (copied)
	* code/branches/merge/bin/levels/sample.oxw (modified)
	* code/branches/merge/cmake/FindBoost.cmake (modified)
	* code/branches/merge/src/network (copied)
	* code/branches/merge/src/network/CMakeLists.txt (copied)
	* code/branches/merge/src/network/Client.cc (copied)
	* code/branches/merge/src/network/Client.h (copied)
	* code/branches/merge/src/network/ClientConnection.cc (copied)
	* code/branches/merge/src/network/ClientConnection.h (copied)
	* code/branches/merge/src/network/ClientInformation.cc (copied)
	* code/branches/merge/src/network/ClientInformation.h (copied)
	* code/branches/merge/src/network/ConnectionManager.cc (copied)
	* code/branches/merge/src/network/ConnectionManager.h (copied)
	* code/branches/merge/src/network/GameStateClient.cc (copied)
	* code/branches/merge/src/network/GameStateClient.h (copied)
	* code/branches/merge/src/network/GameStateManager.cc (copied)
	* code/branches/merge/src/network/GameStateManager.h (copied)
	* code/branches/merge/src/network/Makefile.norm (copied)
	* code/branches/merge/src/network/Makefile.tardis (copied)
	* code/branches/merge/src/network/Makefile.test (copied)
	* code/branches/merge/src/network/NetworkPrereqs.h (copied)
	* code/branches/merge/src/network/PacketBuffer.cc (copied)
	* code/branches/merge/src/network/PacketBuffer.h (copied)
	* code/branches/merge/src/network/PacketDecoder.cc (copied)
	* code/branches/merge/src/network/PacketGenerator.cc (copied)
	* code/branches/merge/src/network/PacketManager.h (copied)
	* code/branches/merge/src/network/PacketTypes.h (copied)
	* code/branches/merge/src/network/Server.cc (copied)
	* code/branches/merge/src/network/Server.h (copied)
	* code/branches/merge/src/network/Synchronisable.cc (copied)
	* code/branches/merge/src/network/Synchronisable.h (copied)
	* code/branches/merge/src/network/TODO (copied)
	* code/branches/merge/src/network/diffTest.cc (copied)
	* code/branches/merge/src/network/dummyclient.cc (copied)
	* code/branches/merge/src/network/dummyclient2.cc (copied)
	* code/branches/merge/src/network/dummyclient3.cc (copied)
	* code/branches/merge/src/network/dummyserver.cc (copied)
	* code/branches/merge/src/network/dummyserver3.cc (copied)
	* code/branches/merge/src/orxonox/CMakeLists.txt (modified)
	* code/branches/merge/src/orxonox/Main.cc (modified)
	* code/branches/merge/src/orxonox/Orxonox.cc (modified)
	* code/branches/merge/src/orxonox/Orxonox.h (modified)
	* code/branches/merge/src/orxonox/objects/Ambient.cc (modified)
	* code/branches/merge/src/orxonox/objects/Ambient.h (modified)
	* code/branches/merge/src/orxonox/objects/Camera.cc (modified)
	* code/branches/merge/src/orxonox/objects/Camera.h (modified)
	* code/branches/merge/src/orxonox/objects/CameraHandler.cc (copied)
	* code/branches/merge/src/orxonox/objects/CameraHandler.h (copied)
	* code/branches/merge/src/orxonox/objects/Model.cc (modified)
	* code/branches/merge/src/orxonox/objects/NPC.cc (modified)
	* code/branches/merge/src/orxonox/objects/NPC.h (modified)
	* code/branches/merge/src/orxonox/objects/Skybox.cc (modified)
	* code/branches/merge/src/orxonox/objects/Skybox.h (modified)
	* code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified)
	* code/branches/merge/src/orxonox/objects/SpaceShip.h (modified)
	* code/branches/merge/src/orxonox/objects/WorldEntity.cc (modified)
	* code/branches/merge/src/orxonox/particle/ParticleInterface.cc (modified)

	merge network3 and camera branch into merge branch


Tue, 13 May 2008 13:22:56 GMT scheusso [1262]
	* code/branches/merge (copied)

	creating merge branch


Fri, 02 May 2008 19:23:30 GMT landauf [1214]
	* code/trunk/CMakeLists.txt (modified)
	* code/trunk/cmake/FindTCL.cmake (modified)
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/core/CMakeLists.txt (modified)
	* code/trunk/src/core/CommandExecutor.cc (modified)
	* code/trunk/src/core/CommandExecutor.h (modified)
	* code/trunk/src/core/CorePrereqs.h (modified)
	* code/trunk/src/core/Functor.h (modified)
	* code/trunk/src/core/InputBuffer.cc (modified)
	* code/trunk/src/core/InputBuffer.h (modified)
	* code/trunk/src/core/InputHandler.cc (modified)
	* code/trunk/src/core/TclBind.cc (copied)
	* code/trunk/src/core/TclBind.h (copied)
	* code/trunk/src/cpptcl (copied)
	* code/trunk/src/cpptcl/CMakeLists.txt (copied)
	* code/trunk/src/cpptcl/CREDITS (copied)
	* code/trunk/src/cpptcl/CppTcl.cc (copied)
	* code/trunk/src/cpptcl/CppTcl.h (copied)
	* code/trunk/src/cpptcl/LICENSE (copied)
	* code/trunk/src/cpptcl/README (copied)
	* code/trunk/src/cpptcl/details (copied)
	* code/trunk/src/cpptcl/details/callbacks.h (copied)
	* code/trunk/src/cpptcl/details/callbacks_v.h (copied)
	* code/trunk/src/cpptcl/details/constructors.h (copied)
	* code/trunk/src/cpptcl/details/conversions.h (copied)
	* code/trunk/src/cpptcl/details/dispatchers.h (copied)
	* code/trunk/src/cpptcl/details/metahelpers.h (copied)
	* code/trunk/src/cpptcl/details/methods.h (copied)
	* code/trunk/src/cpptcl/details/methods_v.h (copied)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/GraphicsEngine.cc (modified)
	* code/trunk/src/orxonox/GraphicsEngine.h (modified)
	* code/trunk/src/orxonox/Main.cc (modified)
	* code/trunk/src/orxonox/Orxonox.cc (modified)
	* code/trunk/src/orxonox/Orxonox.h (modified)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/console (copied)
	* code/trunk/src/orxonox/console/InGameConsole.cc (copied)
	* code/trunk/src/orxonox/console/InGameConsole.h (copied)
	* code/trunk/src/util/String.cc (modified)
	* code/trunk/visual_studio/vc8/orxonox.vcproj (modified)

	merged console-branch back to trunk.
	IMPORTANT: update your media ...