- Timestamp:
- Nov 1, 2008, 2:38:21 PM (16 years ago)
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
code/branches/pickups/src/orxonox/objects/pickup/Usable.h
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/ceguilua/src/orxonox/objects/pickup/Usable 1802-1808 /code/branches/core3/src/orxonox/objects/pickup/Usable 1572-1739 /code/branches/gcc43/src/orxonox/objects/pickup/Usable 1580 /code/branches/gui/src/orxonox/objects/pickup/Usable 1635-1723 /code/branches/input/src/orxonox/objects/pickup/Usable 1629-1636
r2082 r2083 3 3 namespace orxonox{ 4 4 class _OrxonoxExport Usable: public ShipItem{ 5 5 6 6 public: 7 7 subtypeusable CheckSubType(); 8 8 private: 9 9 subtypeusable subtype; 10 11 } 10 11 }; 12 } -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.