Changeset 2492 for code/branches/presentation/src/orxonox/objects/worldentities/triggers

Timestamp:

Dec 17, 2008, 12:55:03 AM (16 years ago)

Author:

rgrieder

Message:

Merged overlay branch into presentation branch.

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.h (modified) (1 prop)