- Timestamp:
- Oct 10, 2018, 3:16:51 PM (6 years ago)
- Location:
- code/branches/mergeFS18
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/mergeFS18
- Property svn:mergeinfo changed
-
code/branches/mergeFS18/src/orxonox/worldentities/ControllableEntity.h
r11071 r12028 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.