diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:24:47 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:24:47 +0100 |
| commit | d433198f60c30f0a2d8aae2dfb8fe2d04cc842a0 (patch) | |
| tree | f01009393fe34a9a7bd42785b4211ce67e2088a2 /src/3rdparty/zlib/inffast.h | |
| parent | f88807e62f48c0e4f714a40d306e1ed0caaa932a (diff) | |
| parent | 8ce0f65e1abf3b0b9a1684dac3a32cd0b03ffc3c (diff) | |
| download | qtsvg-d433198f60c30f0a2d8aae2dfb8fe2d04cc842a0.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
sync.profile
Change-Id: Ibeaf4db17361deb890b154c637a62cfd06b76e26
Diffstat (limited to 'src/3rdparty/zlib/inffast.h')
| -rw-r--r-- | src/3rdparty/zlib/inffast.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/3rdparty/zlib/inffast.h b/src/3rdparty/zlib/inffast.h deleted file mode 100644 index e5c1aa4..0000000 --- a/src/3rdparty/zlib/inffast.h +++ /dev/null @@ -1,11 +0,0 @@ -/* inffast.h -- header to use inffast.c - * Copyright (C) 1995-2003, 2010 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start)); |