- Timestamp:
- Dec 25, 2009, 11:07:09 PM (16 years ago)
- Location:
- code/branches/pickup3
- Files:
- 
          - 2 edited
 
 - 
          . (modified) (1 prop)
- 
          src/orxonox/pickup/PickupCollection.cc (modified) (1 diff)
 
Legend:
- Unmodified
- Added
- Removed
- 
        code/branches/pickup3- Property svn:mergeinfo changed/code/branches/pickup2 (added) merged: 5942,5947,5953,6405 
 
- Property svn:mergeinfo changed
- 
        code/branches/pickup3/src/orxonox/pickup/PickupCollection.ccr6417 r6419 52 52 53 53 /** 54 @brief 55 Add an item to the collection. 56 57 Only adds the item if there's a free slot for it. 58 59 @param item Item to add to the collection. 60 @return Returns whether the item has been added to the collection. 54 @brief 55 Add an item to the collection. 56 57 Only adds the item if there's a free slot for it. 58 59 @param item 60 Item to add to the collection. 61 @return 62 Returns whether the item has been added to the collection. 61 63 */ 62 64 bool PickupCollection::add(BaseItem* item) 
Note: See TracChangeset
          for help on using the changeset viewer.
      


 
            







