Changeset 3068 for code/trunk/src/orxonox/objects

Timestamp:

May 25, 2009, 7:47:11 PM (16 years ago)

Author:

landauf

Message:

removing svn:mergeinfo again after sound2 merge

Location:

code/trunk/src/orxonox/objects

Files:

• Level.cc (modified) (1 prop)
• Level.h (modified) (1 prop)
• collisionshapes (modified) (1 prop)
• gametypes/TeamDeathmatch.cc (modified) (1 prop)
• gametypes/TeamDeathmatch.h (modified) (1 prop)
• pickup/Usable.h (modified) (1 prop)
• quest/AddQuest.cc (modified) (1 prop)
• quest/AddQuest.h (modified) (1 prop)
• quest/AddQuestHint.cc (modified) (1 prop)
• quest/AddQuestHint.h (modified) (1 prop)
• quest/AddReward.cc (modified) (1 prop)
• quest/AddReward.h (modified) (1 prop)
• quest/ChangeQuestStatus.cc (modified) (1 prop)
• quest/ChangeQuestStatus.h (modified) (1 prop)
• quest/CompleteQuest.cc (modified) (1 prop)
• quest/CompleteQuest.h (modified) (1 prop)
• quest/FailQuest.cc (modified) (1 prop)
• quest/FailQuest.h (modified) (1 prop)
• quest/GlobalQuest.cc (modified) (1 prop)
• quest/GlobalQuest.h (modified) (1 prop)
• quest/LocalQuest.cc (modified) (1 prop)
• quest/LocalQuest.h (modified) (1 prop)
• quest/Quest.cc (modified) (1 prop)
• quest/Quest.h (modified) (1 prop)
• quest/QuestDescription.cc (modified) (1 prop)
• quest/QuestDescription.h (modified) (1 prop)
• quest/QuestEffect.cc (modified) (1 prop)
• quest/QuestEffect.h (modified) (1 prop)
• quest/QuestHint.cc (modified) (1 prop)
• quest/QuestHint.h (modified) (1 prop)
• quest/QuestItem.cc (modified) (1 prop)
• quest/QuestItem.h (modified) (1 prop)
• quest/QuestManager.cc (modified) (1 prop)
• quest/QuestManager.h (modified) (1 prop)
• quest/Rewardable.cc (modified) (1 prop)
• quest/Rewardable.h (modified) (1 prop)
• weaponsystem/weaponmodes (modified) (1 prop)
• worldentities/Backlight.cc (modified) (1 prop)
• worldentities/Backlight.h (modified) (1 prop)
• worldentities/Camera.cc (modified) (1 prop)
• worldentities/Camera.h (modified) (1 prop)
• worldentities/MobileEntity.cc (modified) (1 prop)
• worldentities/MobileEntity.h (modified) (1 prop)
• worldentities/ParticleSpawner.cc (modified) (1 prop)
• worldentities/ParticleSpawner.h (modified) (1 prop)
• worldentities/StaticEntity.cc (modified) (1 prop)
• worldentities/StaticEntity.h (modified) (1 prop)
• worldentities/triggers/DistanceTrigger.cc (modified) (1 prop)
• worldentities/triggers/DistanceTrigger.h (modified) (1 prop)
• worldentities/triggers/Trigger.cc (modified) (1 prop)
• worldentities/triggers/Trigger.h (modified) (1 prop)