#
# ChangeLog for code/branches/cpp11_v2/src/libraries/core/command/Executor.h
#
# Generated by Trac 1.0.9
# May 31, 2024, 7:24:56 PM

Sun, 22 Nov 2015 15:55:02 GMT landauf [10825]
	* code/branches/cpp11_v2/src/libraries/core/EventIncludes.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/command/CommandExecutor.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommand.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/command/Executor.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/command/ExecutorPtr.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/command/Functor.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/command/FunctorPtr.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/object/Listable.h (modified)
	* code/branches/cpp11_v2/test/core/command/ExecutorPtrTest.cc (modified)
	* code/branches/cpp11_v2/test/core/command/FunctorPtrTest.cc (modified)

	use std::shared_ptr instead of orxonox::SharedPtr for FunctorPtr and ...


Fri, 06 Nov 2015 21:54:34 GMT landauf [10768]
	* code/branches/cpp11_v2/src/libraries/core/ApplicationPaths.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/BaseObject.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/BaseObject.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/Core.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/GUIManager.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/GUIManager.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/Game.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/Language.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/Loader.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/Namespace.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/NamespaceNode.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/Template.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/Thread.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/ThreadWin.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/XMLPort.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/class/Identifiable.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/class/Identifier.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/class/Identifier.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/class/SubclassIdentifier.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/class/Super.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/command/CommandExecutor.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommand.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/command/Executor.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/command/Functor.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/command/IOConsolePOSIX.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/command/IRC.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/command/TclBind.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/command/TclBind.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/command/TclThreadManager.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/input/Button.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/input/InputManager.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/input/InputState.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/input/Mouse.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/module/DynLibManager.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/module/PluginManager.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationManager.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/object/Context.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/object/StrongPtr.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h (modified)
	* code/branches/cpp11_v2/src/libraries/core/singleton/ScopeManager.cc (modified)
	* code/branches/cpp11_v2/src/libraries/network/Connection.cc (modified)
	* code/branches/cpp11_v2/src/libraries/network/GamestateHandler.cc (modified)
	* code/branches/cpp11_v2/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/cpp11_v2/src/libraries/network/Host.cc (modified)
	* code/branches/cpp11_v2/src/libraries/network/LANDiscoverable.cc (modified)
	* code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h (modified)
	* code/branches/cpp11_v2/src/libraries/network/NetworkFunctionManager.cc (modified)
	* code/branches/cpp11_v2/src/libraries/network/Server.cc (modified)
	* code/branches/cpp11_v2/src/libraries/network/TrafficControl.cc (modified)
	* code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.cc (modified)
	* code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.h (modified)
	* code/branches/cpp11_v2/src/libraries/network/packet/Packet.cc (modified)
	* code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.h (modified)
	* code/branches/cpp11_v2/src/libraries/network/synchronisable/SynchronisableVariable.h (modified)
	* code/branches/cpp11_v2/src/libraries/tools/BillboardSet.cc (modified)
	* code/branches/cpp11_v2/src/libraries/tools/DebugDrawer.cc (modified)
	* code/branches/cpp11_v2/src/libraries/tools/Mesh.cc (modified)
	* code/branches/cpp11_v2/src/libraries/tools/ParticleInterface.cc (modified)
	* code/branches/cpp11_v2/src/libraries/tools/Shader.cc (modified)
	* code/branches/cpp11_v2/src/libraries/tools/Shader.h (modified)
	* code/branches/cpp11_v2/src/libraries/tools/Timer.cc (modified)
	* code/branches/cpp11_v2/src/libraries/util/Math.h (modified)
	* code/branches/cpp11_v2/src/libraries/util/MultiType.h (modified)
	* code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h (modified)
	* code/branches/cpp11_v2/src/libraries/util/SharedPtr.h (modified)
	* code/branches/cpp11_v2/src/libraries/util/SignalHandler.cc (modified)
	* code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.cc (modified)
	* code/branches/cpp11_v2/src/libraries/util/output/OutputManager.cc (modified)
	* code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.cc (modified)
	* code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.cc (modified)
	* code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.cc (modified)
	* code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.cc (modified)
	* code/branches/cpp11_v2/src/modules/invader/Invader.cc (modified)
	* code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/Jump.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpEnemy.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpItem.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpPlatform.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpProjectile.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpSpring.cc (modified)
	* code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.cc (modified)
	* code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameAI.cc (modified)
	* code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.cc (modified)
	* code/branches/cpp11_v2/src/modules/objects/Attacher.cc (modified)
	* code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc (modified)
	* code/branches/cpp11_v2/src/modules/objects/eventsystem/EventDispatcher.cc (modified)
	* code/branches/cpp11_v2/src/modules/objects/eventsystem/EventFilter.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/stats/CreateLines.cc (modified)
	* code/branches/cpp11_v2/src/modules/overlays/stats/Stats.cc (modified)
	* code/branches/cpp11_v2/src/modules/pong/Pong.cc (modified)
	* code/branches/cpp11_v2/src/modules/pong/PongAI.cc (modified)
	* code/branches/cpp11_v2/src/modules/pong/PongBall.cc (modified)
	* code/branches/cpp11_v2/src/modules/pong/PongScore.cc (modified)
	* code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.cc (modified)
	* code/branches/cpp11_v2/src/modules/portals/PortalLink.cc (modified)
	* code/branches/cpp11_v2/src/modules/tetris/Tetris.cc (modified)
	* code/branches/cpp11_v2/src/modules/tetris/TetrisScore.cc (modified)
	* code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseHUDController.cc (modified)
	* code/branches/cpp11_v2/src/modules/weapons/projectiles/ParticleProjectile.cc (modified)
	* code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/CameraManager.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/Level.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/LevelManager.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/PlayerManager.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/Radar.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/Scene.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/Scene.h (modified)
	* code/branches/cpp11_v2/src/orxonox/Test.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/collisionshapes/CollisionShape.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified)
	* code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/controllers/Controller.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/controllers/DroneController.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/controllers/FormationController.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/controllers/WaypointPatrolController.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/gametypes/Asteroids.h (modified)
	* code/branches/cpp11_v2/src/orxonox/gametypes/Deathmatch.h (modified)
	* code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h (modified)
	* code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.h (modified)
	* code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h (modified)
	* code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.h (modified)
	* code/branches/cpp11_v2/src/orxonox/gametypes/Mission.h (modified)
	* code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.h (modified)
	* code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.h (modified)
	* code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.h (modified)
	* code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h (modified)
	* code/branches/cpp11_v2/src/orxonox/graphics/Backlight.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/graphics/Light.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/graphics/Model.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/graphics/ParticleEmitter.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/interfaces/RadarViewable.h (modified)
	* code/branches/cpp11_v2/src/orxonox/items/Engine.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/weaponsystem/Munition.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.h (modified)
	* code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/worldentities/BigExplosion.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/worldentities/Drone.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/worldentities/ExplosionChunk.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/worldentities/SpawnPoint.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/branches/cpp11_v2/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Spectator.cc (modified)
	* code/branches/cpp11_v2/test/core/command/CommandTest.cc (modified)
	* code/branches/cpp11_v2/test/core/object/StrongPtrTest.cc (modified)
	* code/branches/cpp11_v2/test/core/object/WeakPtrTest.cc (modified)
	* code/branches/cpp11_v2/test/util/SharedPtrTest.cc (modified)
	* code/branches/cpp11_v2/test/util/SmallObjectAllocatorTest.cc (modified)

	replace '0' by 'nullptr'


Sat, 31 Oct 2015 16:41:17 GMT landauf [10732]
	* code/branches/cpp11_v2 (copied)

	created new branch for cpp11


Tue, 12 Mar 2013 22:13:03 GMT landauf [9550]
	* code/trunk (modified)
	* code/trunk/CMakeLists.txt (modified)
	* code/trunk/cmake/tools/TargetUtilities.cmake (modified)
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/SourceConfig.cmake (copied)
	* code/trunk/src/external/CMakeLists.txt (modified)
	* code/trunk/src/external/gmock (copied)
	* code/trunk/src/external/gtest (copied)
	* code/trunk/src/libraries/core/CommandLineParser.cc (modified)
	* code/trunk/src/libraries/core/CommandLineParser.h (modified)
	* code/trunk/src/libraries/core/ConfigValueContainer.cc (modified)
	* code/trunk/src/libraries/core/Core.cc (modified)
	* code/trunk/src/libraries/core/PathConfig.cc (modified)
	* code/trunk/src/libraries/core/command/CommandEvaluation.cc (modified)
	* code/trunk/src/libraries/core/command/CommandExecutor.cc (modified)
	* code/trunk/src/libraries/core/command/ConsoleCommand.h (modified)
	* code/trunk/src/libraries/core/command/Executor.cc (modified)
	* code/trunk/src/libraries/core/command/Executor.h (modified)
	* code/trunk/src/libraries/core/command/Functor.h (modified)
	* code/trunk/src/libraries/core/command/IOConsolePOSIX.cc (modified)
	* code/trunk/src/libraries/core/command/IOConsoleWindows.cc (modified)
	* code/trunk/src/libraries/core/command/Shell.cc (modified)
	* code/trunk/src/libraries/core/command/TclBind.cc (modified)
	* code/trunk/src/libraries/core/input/InputManager.cc (modified)
	* code/trunk/src/libraries/network/Client.cc (modified)
	* code/trunk/src/libraries/tools/Shader.cc (modified)
	* code/trunk/src/libraries/tools/Shader.h (modified)
	* code/trunk/src/libraries/util/Math.h (modified)
	* code/trunk/src/libraries/util/MultiType.cc (modified)
	* code/trunk/src/libraries/util/MultiType.h (modified)
	* code/trunk/src/libraries/util/MultiTypeValue.h (modified)
	* code/trunk/src/libraries/util/SignalHandler.cc (modified)
	* code/trunk/src/libraries/util/SignalHandler.h (modified)
	* code/trunk/src/libraries/util/StringUtils.cc (modified)
	* code/trunk/src/libraries/util/StringUtils.h (modified)
	* code/trunk/src/libraries/util/SubString.cc (modified)
	* code/trunk/src/libraries/util/SubString.h (modified)
	* code/trunk/src/libraries/util/UtilPrereqs.h (modified)
	* code/trunk/src/libraries/util/VA_NARGS.h (modified)
	* code/trunk/src/libraries/util/output/AdditionalContextListener.h (copied)
	* code/trunk/src/libraries/util/output/ConsoleWriter.cc (modified)
	* code/trunk/src/libraries/util/output/ConsoleWriter.h (modified)
	* code/trunk/src/libraries/util/output/LogWriter.cc (modified)
	* code/trunk/src/libraries/util/output/LogWriter.h (modified)
	* code/trunk/src/libraries/util/output/MemoryWriter.cc (modified)
	* code/trunk/src/libraries/util/output/MemoryWriter.h (modified)
	* code/trunk/src/libraries/util/output/OutputDefinitions.h (modified)
	* code/trunk/src/libraries/util/output/OutputListener.cc (modified)
	* code/trunk/src/libraries/util/output/OutputListener.h (modified)
	* code/trunk/src/libraries/util/output/OutputManager.cc (modified)
	* code/trunk/src/libraries/util/output/OutputManager.h (modified)
	* code/trunk/src/libraries/util/output/OutputStream.h (modified)
	* code/trunk/src/libraries/util/output/SubcontextOutputListener.h (modified)
	* code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified)
	* code/trunk/src/orxonox-main.vcproj.user.in (deleted)
	* code/trunk/src/orxonox-main.vcxproj.user.in (deleted)
	* code/trunk/src/orxonox/LevelManager.cc (modified)
	* code/trunk/src/orxonox/Main.cc (modified)
	* code/trunk/src/orxonox/graphics/ParticleEmitter.cc (modified)
	* code/trunk/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/trunk/src/template.vcproj.user.in (copied)
	* code/trunk/src/template.vcxproj.user.in (copied)
	* code/trunk/test (copied)

	merged testing branch back to trunk. unbelievable it took me 13 ...