Changeset 2088 for code/trunk/src/orxonox/objects
- Timestamp:
- Nov 1, 2008, 7:16:27 PM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 3 edited
- 7 copied
-
. (modified) (1 prop)
-
src/orxonox/objects/infos/Level.cc (modified) (1 prop)
-
src/orxonox/objects/infos/Level.h (modified) (1 prop)
-
src/orxonox/objects/pickup (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup)
-
src/orxonox/objects/pickup/ShipEquipment.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ShipEquipment.h)
-
src/orxonox/objects/pickup/ShipEquipmentClasses.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ShipEquipmentClasses.cc)
-
src/orxonox/objects/pickup/ShipEquipmentClasses.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ShipEquipmentClasses.h)
-
src/orxonox/objects/pickup/ShipItem.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ShipItem.cc)
-
src/orxonox/objects/pickup/ShipItem.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ShipItem.h)
-
src/orxonox/objects/pickup/Usable.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/Usable.h)
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/pickups (added) merged: 1927,1997-1998,2000,2055,2083
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/infos/Level.cc
- Property svn:mergeinfo changed
/code/trunk/src/orxonox/objects/infos/Level.cc (added) merged: 2-1925
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/infos/Level.h
- Property svn:mergeinfo changed
/code/trunk/src/orxonox/objects/infos/Level.h (added) merged: 2-1925
- Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.
