diff options
| author | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
| commit | c05c42ecc60c8f928628787272743f169a0d5903 (patch) | |
| tree | f2b06be630676b7302a1fb62940099b2ec71442d /backends/log | |
| parent | e43a6671fc04f2c67b8efa2c0fdfdd6ec0ea1023 (diff) | |
| parent | 45dc303159d5bbe77a351df31e6f2d2f97a3412d (diff) | |
| download | scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.gz scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.bz2 scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.zip | |
Merge remote branch 'upstream/master' into soccer
Diffstat (limited to 'backends/log')
| -rw-r--r-- | backends/log/log.cpp | 1 | ||||
| -rw-r--r-- | backends/log/log.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/backends/log/log.cpp b/backends/log/log.cpp index c02643b48b..693399bae5 100644 --- a/backends/log/log.cpp +++ b/backends/log/log.cpp @@ -102,4 +102,3 @@ void Log::printTimeStamp() { } // End of namespace Log } // End of namespace Backends - diff --git a/backends/log/log.h b/backends/log/log.h index 8c95bfc435..524f70405f 100644 --- a/backends/log/log.h +++ b/backends/log/log.h @@ -126,4 +126,3 @@ private: } // End of namespace Backends #endif - |