- Timestamp:
- May 21, 2010, 10:25:27 AM (15 years ago)
- Location:
- code/branches/presentation3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3
- Property svn:mergeinfo changed
/code/branches/rocket (added) merged: 6778-6781,6783-6785,6803,6809-6811,6813-6818,6827,6834,6863,6878,6900,6902-6905,6943,6948-6950
- Property svn:mergeinfo changed
-
code/branches/presentation3/src/orxonox/controllers/NewHumanController.h
r6417 r6951 67 67 virtual void doResumeControl(); 68 68 69 69 70 protected: 70 71 void updateTarget();
Note: See TracChangeset
for help on using the changeset viewer.