summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVegard Storheil Eriksen <zyp@jvnv.net>2011-01-29 20:18:17 +0100
committerVegard Storheil Eriksen <zyp@jvnv.net>2011-01-29 20:18:17 +0100
commitb81cf7c03bad4fb8ef859b6921c94b472131029d (patch)
treefe38f49c4dcbf5a3ec1eaa2620a7b4a0137948f2
parente14b2f145ee43a652d71f53e3f645c58bb7b8e6f (diff)
Renamed time to timer to avoid conflict.
-rw-r--r--timer.cpp (renamed from time.cpp)2
-rw-r--r--timer.h (renamed from time.h)0
2 files changed, 1 insertions, 1 deletions
diff --git a/time.cpp b/timer.cpp
index fb2137d..1285d65 100644
--- a/time.cpp
+++ b/timer.cpp
@@ -1,4 +1,4 @@
-#include "time.h"
+#include "timer.h"
Clock::Clock() {
reset();
diff --git a/time.h b/timer.h
index e580f6c..e580f6c 100644
--- a/time.h
+++ b/timer.h