diff options
author | Nay <dnpd.dd@gmail.com> | 2012-09-03 15:51:34 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2012-09-03 15:51:34 +0100 |
commit | c7fed98b9ddef32b7c17d6022435b5bf8c4fa3f5 (patch) | |
tree | 3ae3947ff14a14208f6ece4e635f0b5641c8c9d3 /dep/zlib/inffixed.h | |
parent | ffe8c75f17aa4c4059771265dd408055cb3c4e52 (diff) | |
parent | 0db5573d4de436cf14c9f6d113a28800fa278c2c (diff) |
Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
dep/PackageList.txt
Diffstat (limited to 'dep/zlib/inffixed.h')
-rw-r--r-- | dep/zlib/inffixed.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dep/zlib/inffixed.h b/dep/zlib/inffixed.h index 75ed4b5978d..d6283277694 100644 --- a/dep/zlib/inffixed.h +++ b/dep/zlib/inffixed.h @@ -2,9 +2,9 @@ * Generated automatically by makefixed(). */ - /* 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. + /* WARNING: this file should *not* be used by applications. + It is part of the implementation of this library and is + subject to change. Applications should only use zlib.h. */ static const code lenfix[512] = { |