diff options
author | 2016-03-02 21:49:49 +0100 | |
---|---|---|
committer | 2016-03-02 21:49:49 +0100 | |
commit | 9fe9f6d93e672bcd926f9e7461774bc9cc22e094 (patch) | |
tree | 3911b611dd010a4108b90fb8b8c82116eec21117 /src/emu/timer.cpp | |
parent | dbdf21ee465acadf3e643d62d6bedfcc297ada85 (diff) | |
parent | 1914702e6fae052668df5b068a502bca57c9a3b0 (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
# Resolved Conflicts:
# src/osd/modules/render/d3d/d3dhlsl.cpp
# src/osd/windows/winmain.cpp
Diffstat (limited to 'src/emu/timer.cpp')
-rw-r--r-- | src/emu/timer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emu/timer.cpp b/src/emu/timer.cpp index 605a16a7d4f..e8d1eb8f8dd 100644 --- a/src/emu/timer.cpp +++ b/src/emu/timer.cpp @@ -2,7 +2,7 @@ // copyright-holders:Aaron Giles /*************************************************************************** - timer.c + timer.cpp Timer devices. |