[Orxonox-commit 518] r3068 - in trunk: bin cmake src/core src/cpptcl src/network/synchronisable src/orxonox src/orxonox/objects src/orxonox/objects/collisionshapes src/orxonox/objects/gametypes src/orxonox/objects/pickup src/orxonox/objects/quest src/orxonox/objects/weaponsystem/weaponmodes src/orxonox/objects/worldentities src/orxonox/objects/worldentities/triggers src/tolua src/util

landauf at orxonox.net landauf at orxonox.net
Mon May 25 19:47:11 CEST 2009 

Author: landauf
Date: 2009-05-25 19:47:11 +0200 (Mon, 25 May 2009)
New Revision: 3068

Modified:
   trunk/bin/client1.bat.in
   trunk/bin/client2.bat.in
   trunk/bin/dedicated.bat.in
   trunk/bin/run.bat.in
   trunk/bin/server.bat.in
   trunk/bin/standalone.bat.in
   trunk/cmake/FindDirectX.cmake
   trunk/cmake/LibraryConfigTardis.cmake
   trunk/src/core/LuaBind.cc
   trunk/src/core/LuaBind.h
   trunk/src/core/Template.cc
   trunk/src/core/Template.h
   trunk/src/core/XMLFile.h
   trunk/src/core/XMLIncludes.h
   trunk/src/cpptcl/cpptcl.cc
   trunk/src/cpptcl/cpptcl.h
   trunk/src/network/synchronisable/NetworkCallback.h
   trunk/src/network/synchronisable/Synchronisable.cc
   trunk/src/network/synchronisable/Synchronisable.h
   trunk/src/orxonox/CameraManager.cc
   trunk/src/orxonox/CameraManager.h
   trunk/src/orxonox/objects/Level.cc
   trunk/src/orxonox/objects/Level.h
   trunk/src/orxonox/objects/collisionshapes/
   trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc
   trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h
   trunk/src/orxonox/objects/pickup/Usable.h
   trunk/src/orxonox/objects/quest/AddQuest.cc
   trunk/src/orxonox/objects/quest/AddQuest.h
   trunk/src/orxonox/objects/quest/AddQuestHint.cc
   trunk/src/orxonox/objects/quest/AddQuestHint.h
   trunk/src/orxonox/objects/quest/AddReward.cc
   trunk/src/orxonox/objects/quest/AddReward.h
   trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc
   trunk/src/orxonox/objects/quest/ChangeQuestStatus.h
   trunk/src/orxonox/objects/quest/CompleteQuest.cc
   trunk/src/orxonox/objects/quest/CompleteQuest.h
   trunk/src/orxonox/objects/quest/FailQuest.cc
   trunk/src/orxonox/objects/quest/FailQuest.h
   trunk/src/orxonox/objects/quest/GlobalQuest.cc
   trunk/src/orxonox/objects/quest/GlobalQuest.h
   trunk/src/orxonox/objects/quest/LocalQuest.cc
   trunk/src/orxonox/objects/quest/LocalQuest.h
   trunk/src/orxonox/objects/quest/Quest.cc
   trunk/src/orxonox/objects/quest/Quest.h
   trunk/src/orxonox/objects/quest/QuestDescription.cc
   trunk/src/orxonox/objects/quest/QuestDescription.h
   trunk/src/orxonox/objects/quest/QuestEffect.cc
   trunk/src/orxonox/objects/quest/QuestEffect.h
   trunk/src/orxonox/objects/quest/QuestHint.cc
   trunk/src/orxonox/objects/quest/QuestHint.h
   trunk/src/orxonox/objects/quest/QuestItem.cc
   trunk/src/orxonox/objects/quest/QuestItem.h
   trunk/src/orxonox/objects/quest/QuestManager.cc
   trunk/src/orxonox/objects/quest/QuestManager.h
   trunk/src/orxonox/objects/quest/Rewardable.cc
   trunk/src/orxonox/objects/quest/Rewardable.h
   trunk/src/orxonox/objects/weaponsystem/weaponmodes/
   trunk/src/orxonox/objects/worldentities/Backlight.cc
   trunk/src/orxonox/objects/worldentities/Backlight.h
   trunk/src/orxonox/objects/worldentities/Camera.cc
   trunk/src/orxonox/objects/worldentities/Camera.h
   trunk/src/orxonox/objects/worldentities/MobileEntity.cc
   trunk/src/orxonox/objects/worldentities/MobileEntity.h
   trunk/src/orxonox/objects/worldentities/ParticleSpawner.cc
   trunk/src/orxonox/objects/worldentities/ParticleSpawner.h
   trunk/src/orxonox/objects/worldentities/StaticEntity.cc
   trunk/src/orxonox/objects/worldentities/StaticEntity.h
   trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
   trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h
   trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc
   trunk/src/orxonox/objects/worldentities/triggers/Trigger.h
   trunk/src/tolua/all-5.0.lua
   trunk/src/tolua/all-5.1.lua
   trunk/src/util/
   trunk/src/util/Exception.cc
   trunk/src/util/Exception.h
   trunk/src/util/SignalHandler.cc
   trunk/src/util/SignalHandler.h
Log:
removing svn:mergeinfo again after sound2 merge


Property changes on: trunk/bin/client1.bat.in
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/bin/client1.bat.in:2830-3011


Property changes on: trunk/bin/client2.bat.in
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/bin/client2.bat.in:2830-3011


Property changes on: trunk/bin/dedicated.bat.in
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/bin/dedicated.bat.in:2830-3011


Property changes on: trunk/bin/run.bat.in
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/bin/run.bat.in:2830-3011


Property changes on: trunk/bin/server.bat.in
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/bin/server.bat.in:2830-3011


Property changes on: trunk/bin/standalone.bat.in
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/bin/standalone.bat.in:2830-3011


Property changes on: trunk/cmake/FindDirectX.cmake
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/cmake/FindDirectX.cmake:2830-3011


Property changes on: trunk/cmake/LibraryConfigTardis.cmake
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/cmake/LibraryConfigTardis.cmake:2830-3011


Property changes on: trunk/src/core/LuaBind.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/core/LuaBind.cc:2830-3011


Property changes on: trunk/src/core/LuaBind.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/core/LuaBind.h:2830-3011


Property changes on: trunk/src/core/Template.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/core/Template.cc:2830-3011


Property changes on: trunk/src/core/Template.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/core/Template.h:2830-3011


Property changes on: trunk/src/core/XMLFile.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/core/XMLFile.h:2830-3011


Property changes on: trunk/src/core/XMLIncludes.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/core/XMLIncludes.h:2830-3011


Property changes on: trunk/src/cpptcl/cpptcl.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/cpptcl/cpptcl.cc:2830-3011


Property changes on: trunk/src/cpptcl/cpptcl.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/cpptcl/cpptcl.h:2830-3011


Property changes on: trunk/src/network/synchronisable/NetworkCallback.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/network/synchronisable/NetworkCallback.h:2830-3011


Property changes on: trunk/src/network/synchronisable/Synchronisable.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/network/synchronisable/Synchronisable.cc:2830-3011


Property changes on: trunk/src/network/synchronisable/Synchronisable.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/network/synchronisable/Synchronisable.h:2830-3011


Property changes on: trunk/src/orxonox/CameraManager.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/CameraManager.cc:2830-3011


Property changes on: trunk/src/orxonox/CameraManager.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/CameraManager.h:2830-3011


Property changes on: trunk/src/orxonox/objects/Level.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/Level.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/Level.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/Level.h:2830-3011


Property changes on: trunk/src/orxonox/objects/collisionshapes
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/collisionshapes:2830-3011


Property changes on: trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/gametypes/TeamDeathmatch.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/gametypes/TeamDeathmatch.h:2830-3011


Property changes on: trunk/src/orxonox/objects/pickup/Usable.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/pickup/Usable.h:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/AddQuest.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/AddQuest.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/AddQuest.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/AddQuest.h:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/AddQuestHint.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/AddQuestHint.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/AddQuestHint.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/AddQuestHint.h:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/AddReward.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/AddReward.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/AddReward.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/AddReward.h:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/ChangeQuestStatus.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/ChangeQuestStatus.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/ChangeQuestStatus.h:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/CompleteQuest.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/CompleteQuest.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/CompleteQuest.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/CompleteQuest.h:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/FailQuest.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/FailQuest.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/FailQuest.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/FailQuest.h:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/GlobalQuest.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/GlobalQuest.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/GlobalQuest.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/GlobalQuest.h:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/LocalQuest.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/LocalQuest.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/LocalQuest.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/LocalQuest.h:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/Quest.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/Quest.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/Quest.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/Quest.h:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/QuestDescription.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/QuestDescription.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/QuestDescription.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/QuestDescription.h:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/QuestEffect.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/QuestEffect.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/QuestEffect.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/QuestEffect.h:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/QuestHint.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/QuestHint.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/QuestHint.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/QuestHint.h:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/QuestItem.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/QuestItem.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/QuestItem.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/QuestItem.h:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/QuestManager.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/QuestManager.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/QuestManager.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/QuestManager.h:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/Rewardable.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/Rewardable.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/quest/Rewardable.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/quest/Rewardable.h:2830-3011


Property changes on: trunk/src/orxonox/objects/weaponsystem/weaponmodes
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/buildsystem/src/orxonox/objects/weaponSystem/weapons:1875-2277,2279-2401
/branches/buildsystem2/src/orxonox/objects/weaponSystem/weapons:2507-2659
/branches/buildsystem3/src/orxonox/objects/weaponSystem/weapons:2663-2709
/branches/ceguilua/src/orxonox/objects/weaponSystem/weapons:1803-1809
/branches/core3/src/orxonox/objects/weaponSystem/weapons:1573-1740
/branches/gcc43/src/orxonox/objects/weaponSystem/weapons:1581
/branches/gui/src/orxonox/objects/weaponSystem/weapons:1636-1724,2796-2895
/branches/input/src/orxonox/objects/weaponSystem/weapons:1630-1637
/branches/lodfinal/src/orxonox/objects/weaponSystem/weapons:2373-2412
/branches/miniprojects/src/orxonox/objects/weaponSystem/weapons:2755-2825
/branches/network/src/orxonox/objects/weaponSystem/weapons:2357
/branches/network64/src/orxonox/objects/weaponSystem/weapons:2211-2356
/branches/objecthierarchy/src/orxonox/objects/weaponSystem/weapons:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/weaponSystem/weapons:2172-2480
/branches/overlay/src/orxonox/objects/weaponSystem/weapons:2118-2386
/branches/physics/src/orxonox/objects/weaponSystem/weapons:1913-2056,2108-2440
/branches/physics_merge/src/orxonox/objects/weaponSystem/weapons:2437-2458
/branches/pickups/src/orxonox/objects/weaponSystem/weapons:1927-2087,2128
/branches/pickups2/src/orxonox/objects/weaponSystem/weapons:2108-2498
/branches/presentation/src/orxonox/objects/weaponSystem/weapons:2370-2653,2655-2661
/branches/questsystem/src/orxonox/objects/weaponSystem/weapons:1895-2089
/branches/questsystem2/src/orxonox/objects/weaponSystem/weapons:2108-2260
/branches/script_trigger/src/orxonox/objects/weaponSystem/weapons:1296-1954,1956
/branches/weapon/src/orxonox/objects/weaponSystem/weapons:1926-2095
/branches/weapon2/src/orxonox/objects/weaponSystem/weapons:2108-2489
/branches/weaponsystem/src/orxonox/objects/weaponSystem/weapons:2743-2891


Property changes on: trunk/src/orxonox/objects/worldentities/Backlight.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/worldentities/Backlight.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/worldentities/Backlight.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/worldentities/Backlight.h:2830-3011


Property changes on: trunk/src/orxonox/objects/worldentities/Camera.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/worldentities/Camera.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/worldentities/Camera.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/worldentities/Camera.h:2830-3011


Property changes on: trunk/src/orxonox/objects/worldentities/MobileEntity.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/worldentities/MobileEntity.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/worldentities/MobileEntity.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/worldentities/MobileEntity.h:2830-3011


Property changes on: trunk/src/orxonox/objects/worldentities/ParticleSpawner.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/worldentities/ParticleSpawner.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/worldentities/ParticleSpawner.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/worldentities/ParticleSpawner.h:2830-3011


Property changes on: trunk/src/orxonox/objects/worldentities/StaticEntity.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/worldentities/StaticEntity.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/worldentities/StaticEntity.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/worldentities/StaticEntity.h:2830-3011


Property changes on: trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2830-3011


Property changes on: trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/worldentities/triggers/Trigger.cc:2830-3011


Property changes on: trunk/src/orxonox/objects/worldentities/triggers/Trigger.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/orxonox/objects/worldentities/triggers/Trigger.h:2830-3011


Property changes on: trunk/src/tolua/all-5.0.lua
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/tolua/all-5.0.lua:2830-3011


Property changes on: trunk/src/tolua/all-5.1.lua
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/tolua/all-5.1.lua:2830-3011


Property changes on: trunk/src/util
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/util:2830-3011


Property changes on: trunk/src/util/Exception.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/util/Exception.cc:2830-3011


Property changes on: trunk/src/util/Exception.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/util/Exception.h:2830-3011


Property changes on: trunk/src/util/SignalHandler.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/util/SignalHandler.cc:2830-3011


Property changes on: trunk/src/util/SignalHandler.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/sound/src/util/SignalHandler.h:2830-3011

More information about the Orxonox-commit mailing list