Changeset 11353 for code/trunk/src/orxonox/controllers
- Timestamp:
- Mar 9, 2017, 2:46:20 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/HUD_HS16 (added) merged: 11212,11222-11223,11240-11241,11252-11253,11262-11264,11277,11293,11295,11305,11314,11323,11325,11336
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/controllers/HumanController.h
r11071 r11353 69 69 void stopBoosting(void); 70 70 71 72 71 static void greet(); 73 72 static void switchCamera();
Note: See TracChangeset
for help on using the changeset viewer.