Context Navigation

triggers

Timestamp:

Apr 15, 2009, 5:03:58 PM (16 years ago)

Author:

landauf

Message:

merged pickup into pickup2

Location:

code/branches/pickups2

Files:

code/branches/pickups2
- Property svn:mergeinfo changed
  /code/branches/pickups merged: 2828,2831,2864,2900
- Property svn:ignore set to
  build
  dependencies
code/branches/pickups2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/pickups2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/pickups2/src/orxonox/objects/worldentities/triggers/Trigger.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/pickups2/src/orxonox/objects/worldentities/triggers/Trigger.h
- Property svn:mergeinfo changed (with no actual effect on merging)

Note: See TracChangeset for help on using the changeset viewer.