diff options
author | marha <marha@users.sourceforge.net> | 2013-11-12 13:55:55 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-11-12 13:56:28 +0100 |
commit | 0e01270aeda311bf52c046f6a68e8b3e1fa86cb8 (patch) | |
tree | eee062f34219e5c5d3f3e61caa5d3c39a5185794 /zlib/examples/gzlog.h | |
parent | 3893ee9f6b12465239b63d08763bd9ba0bd329e5 (diff) | |
parent | 4bdf8409331f44417c3622bc5ec0e42c0e68afb6 (diff) | |
download | vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.tar.gz vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.tar.bz2 vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
Updated zlib to 1.2.8
Conflicts:
zlib/win32/zlib.def
Diffstat (limited to 'zlib/examples/gzlog.h')
-rw-r--r-- | zlib/examples/gzlog.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/zlib/examples/gzlog.h b/zlib/examples/gzlog.h index c46142673..86f0cecba 100644 --- a/zlib/examples/gzlog.h +++ b/zlib/examples/gzlog.h @@ -1,6 +1,6 @@ /* gzlog.h - Copyright (C) 2004, 2008 Mark Adler, all rights reserved - version 2.0, 25 Apr 2008 + Copyright (C) 2004, 2008, 2012 Mark Adler, all rights reserved + version 2.2, 14 Aug 2012 This software is provided 'as-is', without any express or implied warranty. In no event will the author be held liable for any damages @@ -27,6 +27,8 @@ Interface changed slightly in that now path is a prefix Compression now occurs as needed during gzlog_write() gzlog_write() now always leaves the log file as valid gzip + 2.1 8 Jul 2012 Fix argument checks in gzlog_compress() and gzlog_write() + 2.2 14 Aug 2012 Clean up signed comparisons */ /* |