Changeset 9005 for code/branches/presentation2011/src/orxonox/controllers/HumanController.h

Timestamp:

Dec 19, 2011, 2:43:04 PM (13 years ago)

Author:

willis

Message:

fixed merging some merging bugs and some other bugs…

File:

• code/branches/presentation2011/src/orxonox/controllers/HumanController.h (modified) (1 diff)

code/branches/presentation2011/src/orxonox/controllers/HumanController.h

@@ -113 +113 @@
             Timer boostingTimeout_; // A timer to check whether the player is no longer boosting.
             static const float BOOSTING_TIME; // The time after it is checked, whether the player is no longer boosting.
-            FormationController* tempMaster;
 
     }; // tolua_export