diff options
| author | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
| commit | 00279659b22cbd5db739d5351e83a9fc2a2ae408 (patch) | |
| tree | 497f06f46820043cbdf1725652b8f0073223e24a /audio/timestamp.h | |
| parent | d932df79bed5aac97e17c0920a5e75cb5ce733ee (diff) | |
| parent | d1628feb761acc9f4607f64de3eb620fea53bcc9 (diff) | |
| download | scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.gz scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.bz2 scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'audio/timestamp.h')
| -rw-r--r-- | audio/timestamp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/timestamp.h b/audio/timestamp.h index ef095a2106..1683b554cb 100644 --- a/audio/timestamp.h +++ b/audio/timestamp.h @@ -20,8 +20,8 @@ * */ -#ifndef SOUND_TIMESTAMP_H -#define SOUND_TIMESTAMP_H +#ifndef AUDIO_TIMESTAMP_H +#define AUDIO_TIMESTAMP_H #include "common/scummsys.h" |