Changeset 3073 for code/trunk/src/orxonox/objects/pickup/items
- Timestamp:
- May 25, 2009, 8:30:15 PM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 1 edited
- 8 copied
-
. (modified) (2 props)
-
src/orxonox/objects/pickup/items (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/items)
-
src/orxonox/objects/pickup/items/CMakeLists.txt (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/items/CMakeLists.txt)
-
src/orxonox/objects/pickup/items/HealthImmediate.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/items/HealthImmediate.cc)
-
src/orxonox/objects/pickup/items/HealthImmediate.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/items/HealthImmediate.h)
-
src/orxonox/objects/pickup/items/HealthUsable.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/items/HealthUsable.cc)
-
src/orxonox/objects/pickup/items/HealthUsable.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/items/HealthUsable.h)
-
src/orxonox/objects/pickup/items/Jump.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/items/Jump.cc)
-
src/orxonox/objects/pickup/items/Jump.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/items/Jump.h)
-
code/trunk
- Property svn:ignore
-
old new 1 1 build 2 2 codeblocks 3 dependencies
-
- Property svn:mergeinfo changed
/code/branches/pickups merged: 2828,2831,2864,2900 /code/branches/pickups2 merged: 2916-2917,2972,3001,3016,3040-3042,3046,3063
- Property svn:ignore
Note: See TracChangeset
for help on using the changeset viewer.
