Changeset 1502 for code/trunk/src/orxonox/tools/Timer.h

Timestamp:

Jun 1, 2008, 3:54:20 PM (17 years ago)

Author:

rgrieder

Message:

• @everyone: Do not create a branch until I've added the svn:eol-style property correctly. Otherwise this would cost me another 4 hours or so when we want to merge back.
• merged network branch back to trunk
• I had to omit the changes from last evening concerning the line endings
• might not work yet because of the line endings
• @beni: script branch is the only branch still open. you probably will have to apply a patch because of inconsistent new lines

File:

• code/trunk/src/orxonox/tools/Timer.h (modified) (1 diff)

code/trunk/src/orxonox/tools/Timer.h

@@ -69 +69 @@
     class StaticTimer;
     void delay(float delay, const std::string& command);
+    void killdelays();
     void executeDelayedCommand(StaticTimer* timer, const std::string& command);