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 /graphics/scaler/scale3x.cpp | |
| 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 'graphics/scaler/scale3x.cpp')
| -rw-r--r-- | graphics/scaler/scale3x.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/graphics/scaler/scale3x.cpp b/graphics/scaler/scale3x.cpp index 788c8694c5..4ce738a37a 100644 --- a/graphics/scaler/scale3x.cpp +++ b/graphics/scaler/scale3x.cpp @@ -220,4 +220,3 @@ void scale3x_32_def(scale3x_uint32* dst0, scale3x_uint32* dst1, scale3x_uint32* scale3x_32_def_center(dst1, src0, src1, src2, count); scale3x_32_def_border(dst2, src2, src1, src0, count); } - |