Changeset 9667 for code/trunk/src/libraries/tools/Timer.h

Timestamp:

Aug 25, 2013, 9:08:42 PM (12 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

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

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

@@ -79 +79 @@
 #include "tools/ToolsPrereqs.h"
 
-#include "core/OrxonoxClass.h"
+#include "core/class/OrxonoxClass.h"
 #include "core/command/ExecutorPtr.h"
 
@@ -102 +102 @@
         on the game time.
     */
-    class _ToolsExport Timer : virtual public OrxonoxClass
+    class _ToolsExport Timer : public OrxonoxClass
     {
         public: