- Timestamp:
- Dec 17, 2017, 2:37:50 PM (8 years ago)
- Location:
- code/branches/Presentation_HS17
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17
- Property svn:mergeinfo changed
/code/branches/ScriptableController_HS17 (added) merged: 11462,11518-11519,11549,11552,11562,11583,11606,11638,11662,11673-11674,11684
- Property svn:mergeinfo changed
-
code/branches/Presentation_HS17/src/orxonox/worldentities/ControllableEntity.h
r11071 r11686 175 175 inline int getTeam() const 176 176 { return this->team_; } 177 177 178 178 179 protected:
Note: See TracChangeset
for help on using the changeset viewer.