diff options
| author | Matthew Hoops | 2011-05-31 14:16:29 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-31 14:16:29 -0400 |
| commit | aa49b38c5a8032586cb94fc4ca07149eecabe64a (patch) | |
| tree | ea5c7617f8c482c8cf4141b728b3ccff5a7f84c7 /graphics/iff.h | |
| parent | d3ea9ab2a9334747eb445c1b45aa30cb17ffdf1b (diff) | |
| parent | c86a6c466fabe31fbf36363aa8d0ac8ea6001b9f (diff) | |
| download | scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.gz scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.bz2 scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.zip | |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
engines/groovie/script.cpp
Diffstat (limited to 'graphics/iff.h')
| -rw-r--r-- | graphics/iff.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/graphics/iff.h b/graphics/iff.h index fc837a3ea2..4d88148372 100644 --- a/graphics/iff.h +++ b/graphics/iff.h @@ -17,9 +17,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ */ /* @@ -114,7 +111,7 @@ void decodePBM(Common::ReadStream &input, Surface &surface, byte *colors); * Decode a given PackBits encoded stream. * * PackBits is an RLE compression algorithm introduced by Apple. It is also - * used to encode ILBM and PBM subtypes of IFF files, and some flavours of + * used to encode ILBM and PBM subtypes of IFF files, and some flavors of * TIFF. * * As there is no compression across row boundaries in the above formats, |