aboutsummaryrefslogtreecommitdiff
path: root/saga/timer.cpp
diff options
context:
space:
mode:
authorJonathan Gray2004-08-01 01:56:22 +0000
committerJonathan Gray2004-08-01 01:56:22 +0000
commit182dd48bd4bf3f1c0bb0e6cf7d208fbe961cf7fa (patch)
tree8e83c3d15a284f734aa0646e5d098ee6bc8942ae /saga/timer.cpp
parent5e3236ac47bcda486642753480b96e6d9848bc54 (diff)
downloadscummvm-rg350-182dd48bd4bf3f1c0bb0e6cf7d208fbe961cf7fa.tar.gz
scummvm-rg350-182dd48bd4bf3f1c0bb0e6cf7d208fbe961cf7fa.tar.bz2
scummvm-rg350-182dd48bd4bf3f1c0bb0e6cf7d208fbe961cf7fa.zip
merge reinherit.h into saga.h and gfx_mod.h, note the error loading animations wasn't caused by this commit :)
svn-id: r14405
Diffstat (limited to 'saga/timer.cpp')
-rw-r--r--saga/timer.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/saga/timer.cpp b/saga/timer.cpp
index b46a89776b..eeaaf7b07f 100644
--- a/saga/timer.cpp
+++ b/saga/timer.cpp
@@ -21,8 +21,7 @@
*
*/
-#include "reinherit.h"
-
+#include "saga.h"
#include "timer.h"
// FIXME: replace calls to this with direct OSystem calls