Changeset 11054 for code/branches/cpp11_v3/src/libraries/tools/Timer.h

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• src/libraries/tools/Timer.h (modified) (1 diff)

code/branches/cpp11_v3/src/libraries/tools/Timer.h

@@ -175 +175 @@
 
         protected:
-            virtual float getTimeFactor();
+            virtual float getTimeFactor() override;
     };
 }