diff options
| author |  Yuri Kunde Schlesner | 2015-05-07 11:45:45 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-05-07 11:45:45 -0700 |
| commit | 4f4d230dac936f32cceb8be35fe09822d85bb2b6 (patch) | |
| tree | a180a736708834708e0e5b95fd1720f37722b429 /src/common/timer.cpp | |
| parent | Merge pull request #695 from Subv/crash_f (diff) | |
| parent | Fix printf format warning (diff) | |
| download | yuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.tar.gz yuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.tar.xz yuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.zip | |
Merge pull request #721 from yuriks/more-cleanups
More cleanups
Diffstat (limited to '')
| -rw-r--r-- | src/common/timer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/timer.cpp b/src/common/timer.cpp index a6682ea19..b99835ac7 100644 --- a/src/common/timer.cpp +++ b/src/common/timer.cpp | |||
| @@ -12,9 +12,9 @@ | |||
| 12 | #include <sys/time.h> | 12 | #include <sys/time.h> |
| 13 | #endif | 13 | #endif |
| 14 | 14 | ||
| 15 | #include "common/common.h" | 15 | #include "common/common_types.h" |
| 16 | #include "common/timer.h" | ||
| 17 | #include "common/string_util.h" | 16 | #include "common/string_util.h" |
| 17 | #include "common/timer.h" | ||
| 18 | 18 | ||
| 19 | namespace Common | 19 | namespace Common |
| 20 | { | 20 | { |