#
# ChangeLog for code/branches/FICN/CMakeLists.txt
#
# Generated by Trac 1.0.9
# May 23, 2024, 7:15:54 PM

Mon, 17 Dec 2007 12:51:14 GMT scheusso [571]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/src/network/GameStateManager.cc (modified)
	* code/branches/FICN/src/network/Synchronisable.cc (modified)
	* code/branches/FICN/src/network/Synchronisable.h (modified)

	cmakelists


Mon, 17 Dec 2007 09:39:12 GMT scheusso [565]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/src/network/Client.cc (modified)
	* code/branches/FICN/src/network/Synchronisable.cc (modified)
	* code/branches/FICN/src/network/Synchronisable.h (modified)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified)
	* code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	added class BaseEntity:
	- !!! please inherit from this class in ...


Sun, 16 Dec 2007 23:16:02 GMT landauf [547]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/cmake/FindENet.cmake (modified)
	* code/branches/FICN/cmake/FindZLIB.cmake (modified)
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified)

	compiles with mingw


Sun, 16 Dec 2007 01:04:21 GMT nicolasc [539]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/Media/materials/textures/bigflame.png (added)
	* code/branches/FICN/Media/materials/textures/black.png (added)
	* code/branches/FICN/Media/materials/textures/explosion.png (added)
	* code/branches/FICN/Media/materials/textures/flaretrail.png (added)
	* code/branches/FICN/Media/materials/textures/human_assf.png (modified)
	* code/branches/FICN/Media/materials/textures/ring_flare.png (added)
	* code/branches/FICN/Media/materials/textures/ring_flare2.png (added)
	* code/branches/FICN/Media/materials/textures/streak.png (added)
	* code/branches/FICN/Media/textures (deleted)
	* code/branches/FICN/bin/resources.cfg (modified)
	* code/branches/FICN/cmake/FindZLIB.cmake (moved)
	* code/branches/FICN/src/network/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	- standardized FindZLIB.cmake
	- minor cleanup in Media


Sun, 16 Dec 2007 00:34:51 GMT landauf [538]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/src/network/CMakeLists.txt (modified)
	* code/branches/FICN/src/network/dummyclient2.cc (modified)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified)

	windows library include (for enet)


Wed, 12 Dec 2007 12:25:03 GMT scheusso [466]
	* code/branches/FICN/CMakeLists.txt (modified)

	fixed CML


Wed, 12 Dec 2007 11:42:30 GMT bknecht [462]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/graphicsEngine.cc (added)
	* code/branches/FICN/src/orxonox/graphicsEngine.h (added)
	* code/branches/FICN/src/orxonox/main.cc (added)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.h (added)
	* code/branches/FICN/src/orxonox/orxonoxOLD.cc (added)

	got my work to compile (it's all hacked together and I dunno if it ...


Wed, 05 Dec 2007 15:22:20 GMT nicolape [402]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/cmake/FindOggVorbis.cmake (modified)
	* code/branches/FICN/src/audio/CMakeLists.txt (modified)

	Fixed ogg loading


Wed, 05 Dec 2007 15:10:19 GMT scheusso [401]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/src/network/Client.cc (modified)
	* code/branches/FICN/src/network/ConnectionManager.cc (modified)
	* code/branches/FICN/src/network/PacketDecoder.cc (modified)
	* code/branches/FICN/src/network/PacketManager.h (modified)
	* code/branches/FICN/src/network/Synchronisable.cc (modified)

	corrected some errors


Wed, 05 Dec 2007 13:30:09 GMT nicolasc [389]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/bin/audio (copied)
	* code/branches/FICN/bin/audio/ambient (copied)
	* code/branches/FICN/bin/audio/ambient/ambient1.ogg (copied)
	* code/branches/FICN/bin/audio/ambient/ambient2.ogg (copied)
	* code/branches/FICN/bin/audio/ambient/ambient3.ogg (copied)
	* code/branches/FICN/bin/audio/sounds (copied)
	* code/branches/FICN/cmake/FindALUT.cmake (copied)
	* code/branches/FICN/cmake/FindOggVorbis.cmake (copied)
	* code/branches/FICN/cmake/FindOpenAL.cmake (copied)
	* code/branches/FICN/cmakeclearcache (copied)
	* code/branches/FICN/src/CMakeLists.txt (modified)
	* code/branches/FICN/src/audio (copied)
	* code/branches/FICN/src/audio/AudioBuffer.cc (copied)
	* code/branches/FICN/src/audio/AudioBuffer.h (copied)
	* code/branches/FICN/src/audio/AudioManager.cc (copied)
	* code/branches/FICN/src/audio/AudioManager.h (copied)
	* code/branches/FICN/src/audio/AudioSource.cc (copied)
	* code/branches/FICN/src/audio/AudioSource.h (copied)
	* code/branches/FICN/src/audio/CMakeLists.txt (copied)
	* code/branches/FICN/src/audio/_Ambient.cc (copied)
	* code/branches/FICN/src/audio/_Ambient.h (copied)
	* code/branches/FICN/src/audio/_AudioObject.cc (copied)
	* code/branches/FICN/src/audio/_AudioObject.h (copied)
	* code/branches/FICN/src/class_hierarchy (added)
	* code/branches/FICN/src/class_hierarchy/BaseObject.cc (added)
	* code/branches/FICN/src/class_hierarchy/BaseObject.h (added)
	* code/branches/FICN/src/class_hierarchy/CMakeLists.txt (added)
	* code/branches/FICN/src/class_hierarchy/ClassHierarchy.cc (added)
	* code/branches/FICN/src/class_hierarchy/ClassHierarchy.h (added)
	* code/branches/FICN/src/class_hierarchy/Identifier.cc (added)
	* code/branches/FICN/src/class_hierarchy/Identifier.h (added)
	* code/branches/FICN/src/class_hierarchy/IdentifierIncludes.h (added)
	* code/branches/FICN/src/class_hierarchy/IdentifierList.cc (added)
	* code/branches/FICN/src/class_hierarchy/IdentifierList.h (added)
	* code/branches/FICN/src/class_hierarchy/ObjectList.cc (added)
	* code/branches/FICN/src/class_hierarchy/ObjectList.h (added)
	* code/branches/FICN/src/class_hierarchy/OrxonoxClass.cc (added)
	* code/branches/FICN/src/class_hierarchy/OrxonoxClass.h (added)
	* code/branches/FICN/src/class_hierarchy/Test.h (added)
	* code/branches/FICN/src/class_hierarchy/orxonox.cc (added)
	* code/branches/FICN/src/class_hierarchy/test1.cc (added)
	* code/branches/FICN/src/class_hierarchy/test1.h (added)
	* code/branches/FICN/src/class_hierarchy/test2.cc (added)
	* code/branches/FICN/src/class_hierarchy/test2.h (added)
	* code/branches/FICN/src/class_hierarchy/test3.cc (added)
	* code/branches/FICN/src/class_hierarchy/test3.h (added)
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	merged audio into FICN


Tue, 04 Dec 2007 23:21:31 GMT nicolasc [386]
	* code/branches/FICN/CMakeLists.txt (modified)

	some *FLAGS tweaking


Tue, 04 Dec 2007 22:29:20 GMT nicolasc [382]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/src/loader/loader_platform.h (modified)

	added CXXFLAGS to force warning output!


Mon, 03 Dec 2007 21:14:04 GMT rgrieder [376]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/src/loader/CMakeLists.txt (modified)
	* code/branches/FICN/src/network/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/hud/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/weapon/CMakeLists.txt (modified)

	- removed the linker flags, since --no-undefined has no influence ...


Mon, 03 Dec 2007 14:44:30 GMT nicolasc [371]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/cmake/FindBoost.cmake (modified)
	* code/branches/FICN/src/network/CMakeLists.txt (modified)

	fixed FindBoost.cmake


Mon, 03 Dec 2007 12:40:31 GMT nicolasc [370]
	* code/branches/FICN/CMakeLists.txt (modified)

	with the help of the ISG.EE, boost should work now


Thu, 29 Nov 2007 17:04:53 GMT nicolasc [354]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/src/CMakeLists.txt (modified)
	* code/branches/FICN/src/loader/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/hud/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified)

	removed all STATIC flags -- according to besch it's worth it
	some ...


Wed, 28 Nov 2007 20:54:59 GMT rgrieder [341]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/src/CMakeLists.txt (modified)
	* code/branches/FICN/src/class_hierarchy (deleted)
	* code/branches/FICN/src/loader/CMakeLists.txt (modified)
	* code/branches/FICN/src/loader/LevelLoader.cc (modified)
	* code/branches/FICN/src/loader/LevelLoader.h (modified)
	* code/branches/FICN/src/loader/Light.cc (modified)
	* code/branches/FICN/src/loader/Light.h (modified)
	* code/branches/FICN/src/loader/LightManager.cc (modified)
	* code/branches/FICN/src/loader/LightManager.h (modified)
	* code/branches/FICN/src/network/CMakeLists.txt (modified)
	* code/branches/FICN/src/network/PacketDecoder.cc (modified)
	* code/branches/FICN/src/network/PacketGenerator.cc (modified)
	* code/branches/FICN/src/network/PacketManager.h (modified)
	* code/branches/FICN/src/network/dummyserver.cc (modified)
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/Flocking.h (deleted)
	* code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/hud/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/hud/hud_overlay.h (modified)
	* code/branches/FICN/src/orxonox/hud/test_overlay.h (modified)
	* code/branches/FICN/src/orxonox/inertial_node.h (deleted)
	* code/branches/FICN/src/orxonox/objects/BaseObject.h (modified)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles (deleted)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/ogre_control.h (deleted)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/orxonox.h (deleted)
	* code/branches/FICN/src/orxonox/orxonox_prerequisites.h (deleted)
	* code/branches/FICN/src/orxonox/orxonox_scene.h (deleted)
	* code/branches/FICN/src/orxonox/orxonox_ship.h (deleted)
	* code/branches/FICN/src/orxonox/run_manager.h (deleted)
	* code/branches/FICN/src/orxonox/weapon/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/weapon/ammunition_dump.cc (modified)
	* code/branches/FICN/src/orxonox/weapon/ammunition_dump.h (modified)
	* code/branches/FICN/src/orxonox/weapon/barrel_gun.cc (modified)
	* code/branches/FICN/src/orxonox/weapon/barrel_gun.h (modified)
	* code/branches/FICN/src/orxonox/weapon/base_weapon.cc (modified)
	* code/branches/FICN/src/orxonox/weapon/base_weapon.h (modified)
	* code/branches/FICN/src/orxonox/weapon/bullet.h (modified)
	* code/branches/FICN/src/orxonox/weapon/bullet_manager.h (modified)
	* code/branches/FICN/src/orxonox/weapon/weapon_station.h (modified)

	- removed folder src/class_hierarchy
	- removed a few unnec. files in ...


Wed, 28 Nov 2007 17:13:04 GMT bknecht [337]
	* code/branches/FICN/CMakeLists.txt (modified)
	* code/branches/FICN/INSTALL (modified)
	* code/branches/FICN/Media/materials (copied)
	* code/branches/FICN/Media/materials/scripts (copied)
	* code/branches/FICN/Media/materials/scripts/Example.material (copied)
	* code/branches/FICN/Media/materials/scripts/Examples.compositor (copied)
	* code/branches/FICN/Media/materials/scripts/Examples.program (copied)
	* code/branches/FICN/Media/materials/scripts/Ogre.material (copied)
	* code/branches/FICN/Media/materials/textures (copied)
	* code/branches/FICN/Media/materials/textures/Dirt.jpg (copied)
	* code/branches/FICN/Media/materials/textures/GreenSkin.jpg (copied)
	* code/branches/FICN/Media/materials/textures/RustyBarrel.png (copied)
	* code/branches/FICN/Media/materials/textures/RustySteel.jpg (copied)
	* code/branches/FICN/Media/materials/textures/WeirdEye.png (copied)
	* code/branches/FICN/Media/materials/textures/cursor.png (copied)
	* code/branches/FICN/Media/materials/textures/dirt01.jpg (copied)
	* code/branches/FICN/Media/materials/textures/flare.png (copied)
	* code/branches/FICN/Media/materials/textures/nskingr.jpg (copied)
	* code/branches/FICN/Media/materials/textures/ogreborder.png (copied)
	* code/branches/FICN/Media/materials/textures/ogreborderUp.png (copied)
	* code/branches/FICN/Media/materials/textures/ogrebordercenter.png (copied)
	* code/branches/FICN/Media/materials/textures/ogrelogo-small.jpg (copied)
	* code/branches/FICN/Media/materials/textures/ogrelogo.png (copied)
	* code/branches/FICN/Media/materials/textures/smoke.png (copied)
	* code/branches/FICN/Media/materials/textures/smokecolors.png (copied)
	* code/branches/FICN/Media/materials/textures/spheremap.png (copied)
	* code/branches/FICN/Media/materials/textures/steelhead.png (copied)
	* code/branches/FICN/Media/models (copied)
	* code/branches/FICN/Media/models/Barrel.mesh (copied)
	* code/branches/FICN/Media/models/cube.mesh (copied)
	* code/branches/FICN/Media/models/fish.mesh (copied)
	* code/branches/FICN/Media/models/fish.skeleton (copied)
	* code/branches/FICN/Media/models/ogrehead.mesh (copied)
	* code/branches/FICN/Media/overlay (copied)
	* code/branches/FICN/Media/overlay/EnergyBackground.png (copied)
	* code/branches/FICN/Media/overlay/EnergyDistrBackground.png (copied)
	* code/branches/FICN/Media/overlay/MapBackGround.png (copied)
	* code/branches/FICN/Media/overlay/MyShip.png (copied)
	* code/branches/FICN/Media/overlay/OrxonoxBlack.png (copied)
	* code/branches/FICN/Media/overlay/OrxonoxHUD.overlay (copied)
	* code/branches/FICN/Media/overlay/OrxonoxHUD1.1.overlay (copied)
	* code/branches/FICN/Media/overlay/OrxonoxHUD1.2.overlay (copied)
	* code/branches/FICN/Media/overlay/OrxonoxORANGE.png (copied)
	* code/branches/FICN/Media/overlay/OrxonoxRED.png (copied)
	* code/branches/FICN/Media/overlay/PrimalWeaponBackground.png (copied)
	* code/branches/FICN/Media/overlay/PrimarBackground.png (copied)
	* code/branches/FICN/Media/overlay/PrimarChoice.png (copied)
	* code/branches/FICN/Media/overlay/PrimarSample.png (copied)
	* code/branches/FICN/Media/overlay/Racket.png (copied)
	* code/branches/FICN/Media/overlay/RacketBackground.png (copied)
	* code/branches/FICN/Media/overlay/RacketBackground.pxi (copied)
	* code/branches/FICN/Media/overlay/RacketGrid.png (copied)
	* code/branches/FICN/Media/overlay/RedPoint.png (copied)
	* code/branches/FICN/Media/overlay/ShildLeftBottom.png (copied)
	* code/branches/FICN/Media/overlay/ShildLeftTop.png (copied)
	* code/branches/FICN/Media/overlay/ShildRightBottom.png (copied)
	* code/branches/FICN/Media/overlay/ShildRightTop.png (copied)
	* code/branches/FICN/Media/overlay/TargetBackground.png (copied)
	* code/branches/FICN/Media/overlay/TimeBackground.png (copied)
	* code/branches/FICN/Media/overlay/backGround.png (copied)
	* code/branches/FICN/Media/overlay/clock.png (copied)
	* code/branches/FICN/Media/overlay/gun.png (copied)
	* code/branches/FICN/Media/overlay/man.png (copied)
	* code/branches/FICN/Media/overlay/shot.png (copied)
	* code/branches/FICN/Media/overlay/superegg.png (copied)
	* code/branches/FICN/Media/packs/cubemap.zip (copied)
	* code/branches/FICN/Media/particle (copied)
	* code/branches/FICN/Media/particle/Example-Water.particle (copied)
	* code/branches/FICN/Media/particle/Example.particle (copied)
	* code/branches/FICN/Media/particle/emitted_emitter.particle (copied)
	* code/branches/FICN/Media/particle/smoke.particle (copied)
	* code/branches/FICN/bin/CMakeCache.txt (copied)
	* code/branches/FICN/bin/resources.cfg (modified)
	* code/branches/FICN/cmake/FindBoost.cmake (copied)
	* code/branches/FICN/cmake/FindENet.cmake (copied)
	* code/branches/FICN/cmake/FindODE.cmake (copied)
	* code/branches/FICN/src/CMakeLists.txt (modified)
	* code/branches/FICN/src/Flocking.h (copied)
	* code/branches/FICN/src/class_hierarchy (copied)
	* code/branches/FICN/src/class_hierarchy/BaseObject.cc (copied)
	* code/branches/FICN/src/class_hierarchy/BaseObject.h (copied)
	* code/branches/FICN/src/class_hierarchy/CMakeLists.txt (copied)
	* code/branches/FICN/src/class_hierarchy/ClassHierarchy.cc (copied)
	* code/branches/FICN/src/class_hierarchy/ClassHierarchy.h (copied)
	* code/branches/FICN/src/class_hierarchy/Identifier.cc (copied)
	* code/branches/FICN/src/class_hierarchy/Identifier.h (copied)
	* code/branches/FICN/src/class_hierarchy/IdentifierIncludes.h (copied)
	* code/branches/FICN/src/class_hierarchy/IdentifierList.cc (copied)
	* code/branches/FICN/src/class_hierarchy/IdentifierList.h (copied)
	* code/branches/FICN/src/class_hierarchy/ObjectList.cc (copied)
	* code/branches/FICN/src/class_hierarchy/ObjectList.h (copied)
	* code/branches/FICN/src/class_hierarchy/OrxonoxClass.cc (copied)
	* code/branches/FICN/src/class_hierarchy/OrxonoxClass.h (copied)
	* code/branches/FICN/src/class_hierarchy/Test.h (copied)
	* code/branches/FICN/src/class_hierarchy/orxonox.cc (copied)
	* code/branches/FICN/src/class_hierarchy/test1.cc (copied)
	* code/branches/FICN/src/class_hierarchy/test1.h (copied)
	* code/branches/FICN/src/class_hierarchy/test2.cc (copied)
	* code/branches/FICN/src/class_hierarchy/test2.h (copied)
	* code/branches/FICN/src/class_hierarchy/test3.cc (copied)
	* code/branches/FICN/src/class_hierarchy/test3.h (copied)
	* code/branches/FICN/src/inertial_node.cc (copied)
	* code/branches/FICN/src/inertial_node.h (copied)
	* code/branches/FICN/src/loader/CMakeLists.txt (copied)
	* code/branches/FICN/src/network/CMakeLists.txt (copied)
	* code/branches/FICN/src/network/Client.cc (copied)
	* code/branches/FICN/src/network/Client.h (copied)
	* code/branches/FICN/src/network/ClientConnection.cc (copied)
	* code/branches/FICN/src/network/ClientConnection.h (copied)
	* code/branches/FICN/src/network/ConnectionManager.cc (copied)
	* code/branches/FICN/src/network/ConnectionManager.h (copied)
	* code/branches/FICN/src/network/GameStateManager.cc (copied)
	* code/branches/FICN/src/network/GameStateManager.h (copied)
	* code/branches/FICN/src/network/Makefile.norm (copied)
	* code/branches/FICN/src/network/Makefile.tardis (copied)
	* code/branches/FICN/src/network/PacketBuffer.cc (copied)
	* code/branches/FICN/src/network/PacketBuffer.h (copied)
	* code/branches/FICN/src/network/PacketBufferTest.cc (copied)
	* code/branches/FICN/src/network/PacketBufferTestExt.cc (copied)
	* code/branches/FICN/src/network/PacketDecoder.cc (copied)
	* code/branches/FICN/src/network/PacketGenerator.cc (copied)
	* code/branches/FICN/src/network/PacketManager.h (copied)
	* code/branches/FICN/src/network/Server.cc (copied)
	* code/branches/FICN/src/network/Server.h (copied)
	* code/branches/FICN/src/network/Synchronisable.cc (copied)
	* code/branches/FICN/src/network/Synchronisable.h (copied)
	* code/branches/FICN/src/network/dummyclient.cc (copied)
	* code/branches/FICN/src/network/dummyclient2.cc (copied)
	* code/branches/FICN/src/network/dummyserver.cc (copied)
	* code/branches/FICN/src/ogre_control.cc (copied)
	* code/branches/FICN/src/ogre_control.h (copied)
	* code/branches/FICN/src/orxonox.h (copied)
	* code/branches/FICN/src/orxonox/CMakeLists.txt (copied)
	* code/branches/FICN/src/orxonox/core/CMakeLists.txt (copied)
	* code/branches/FICN/src/orxonox/core/Iterator.h (modified)
	* code/branches/FICN/src/orxonox/hud (copied)
	* code/branches/FICN/src/orxonox/hud/CMakeLists.txt (copied)
	* code/branches/FICN/src/orxonox/hud/hud_overlay.cc (copied)
	* code/branches/FICN/src/orxonox/hud/hud_overlay.h (copied)
	* code/branches/FICN/src/orxonox/hud/test_overlay.cc (copied)
	* code/branches/FICN/src/orxonox/hud/test_overlay.h (copied)
	* code/branches/FICN/src/orxonox/objects/CMakeFiles (copied)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (copied)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)
	* code/branches/FICN/src/orxonox/spaceship_steering.cc (copied)
	* code/branches/FICN/src/orxonox/spaceship_steering.h (copied)
	* code/branches/FICN/src/orxonox/weapon (copied)
	* code/branches/FICN/src/orxonox/weapon/CMakeLists.txt (copied)
	* code/branches/FICN/src/orxonox/weapon/ammunition_dump.cc (copied)
	* code/branches/FICN/src/orxonox/weapon/ammunition_dump.h (copied)
	* code/branches/FICN/src/orxonox/weapon/barrel_gun.cc (copied)
	* code/branches/FICN/src/orxonox/weapon/barrel_gun.h (copied)
	* code/branches/FICN/src/orxonox/weapon/base_weapon.cc (copied)
	* code/branches/FICN/src/orxonox/weapon/base_weapon.h (copied)
	* code/branches/FICN/src/orxonox/weapon/bullet.cc (copied)
	* code/branches/FICN/src/orxonox/weapon/bullet.h (copied)
	* code/branches/FICN/src/orxonox/weapon/bullet_manager.cc (copied)
	* code/branches/FICN/src/orxonox/weapon/bullet_manager.h (copied)
	* code/branches/FICN/src/orxonox/weapon/weapon_station.cc (copied)
	* code/branches/FICN/src/orxonox/weapon/weapon_station.h (copied)
	* code/branches/FICN/src/orxonox_prerequisites.h (copied)
	* code/branches/FICN/src/orxonox_scene.cc (copied)
	* code/branches/FICN/src/orxonox_scene.h (copied)
	* code/branches/FICN/src/orxonox_ship.cc (copied)
	* code/branches/FICN/src/orxonox_ship.h (copied)
	* code/branches/FICN/src/run_manager.cc (copied)
	* code/branches/FICN/src/run_manager.h (copied)

	merged merger to FICN branch


Wed, 28 Nov 2007 16:31:00 GMT landauf [333]
	* code/branches/FICN (copied)

	new branch for factory, input, core, network


Thu, 01 Nov 2007 18:50:52 GMT nicolasc [142]
	* code/trunk/CMakeLists.txt (modified)
	* code/trunk/src/enet (deleted)
	* code/trunk/src/orxonox.cc (modified)

	global enet test