- Timestamp:
- Dec 23, 2008, 10:40:38 PM (17 years ago)
- Location:
- code/branches/bugger
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/bugger
- Property svn:mergeinfo changed
/code/branches/questsystem2 (added) merged: 2109,2146,2159,2191,2193-2196,2205-2206,2208-2209,2221,2226,2228,2251,2258
- Property svn:mergeinfo changed
-
code/branches/bugger/src/orxonox/objects/quest/Rewardable.cc
- Property svn:mergeinfo changed
/code/branches/questsystem2/src/orxonox/objects/quest/Rewardable.cc (added) merged: 2159,2251 /code/trunk/src/orxonox/objects/quest/Rewardable.cc merged: 1925-2089
r2105 r2530 27 27 */ 28 28 29 /** 30 @file Rewardable.cc 31 @brief 32 Implementation of the Rewardable class. 33 */ 34 29 35 #include "OrxonoxStableHeaders.h" 30 36 #include "Rewardable.h" … … 34 40 namespace orxonox { 35 41 36 42 /** 43 @brief 44 Constructor. Registers the object. 45 */ 37 46 Rewardable::Rewardable(BaseObject* creator) : BaseObject(creator) 38 47 { … … 40 49 } 41 50 42 51 /** 52 @brief 53 Destructor, 54 */ 43 55 Rewardable::~Rewardable() 44 56 { - Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.