diff options
author | 2017-01-25 17:15:54 +0100 | |
---|---|---|
committer | 2017-01-25 17:15:54 +0100 | |
commit | 93c92be81517a982ef9b47eed610a3e42ed244bc (patch) | |
tree | 60ad45f195db92267e54cf44f61d6f932803301f /3rdparty/zlib/win32 | |
parent | c11c22b3e83bdf7ac8d48f0a8e3be48ba31786f8 (diff) |
updated to zlib 1.2.11 (nw)
Diffstat (limited to '3rdparty/zlib/win32')
-rw-r--r-- | 3rdparty/zlib/win32/Makefile.msc | 2 | ||||
-rw-r--r-- | 3rdparty/zlib/win32/README-WIN32.txt | 6 | ||||
-rw-r--r-- | 3rdparty/zlib/win32/VisualC.txt | 2 | ||||
-rw-r--r-- | 3rdparty/zlib/win32/zlib1.rc | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/3rdparty/zlib/win32/Makefile.msc b/3rdparty/zlib/win32/Makefile.msc index 67b773171da..6831882de43 100644 --- a/3rdparty/zlib/win32/Makefile.msc +++ b/3rdparty/zlib/win32/Makefile.msc @@ -1,5 +1,5 @@ # Makefile for zlib using Microsoft (Visual) C -# zlib is copyright (C) 1995-2006 Jean-loup Gailly and Mark Adler +# zlib is copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler # # Usage: # nmake -f win32/Makefile.msc (standard build) diff --git a/3rdparty/zlib/win32/README-WIN32.txt b/3rdparty/zlib/win32/README-WIN32.txt index 5002f3c9117..df7ab7f4b34 100644 --- a/3rdparty/zlib/win32/README-WIN32.txt +++ b/3rdparty/zlib/win32/README-WIN32.txt @@ -1,6 +1,6 @@ ZLIB DATA COMPRESSION LIBRARY -zlib 1.2.9 is a general purpose data compression library. All the code is +zlib 1.2.11 is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) @@ -22,7 +22,7 @@ before asking for help. Manifest: -The package zlib-1.2.9-win32-x86.zip will contain the following files: +The package zlib-1.2.11-win32-x86.zip will contain the following files: README-WIN32.txt This document ChangeLog Changes since previous zlib packages @@ -72,7 +72,7 @@ are too numerous to cite here. Copyright notice: - (C) 1995-2012 Jean-loup Gailly and Mark Adler + (C) 1995-2017 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/3rdparty/zlib/win32/VisualC.txt b/3rdparty/zlib/win32/VisualC.txt index 579a5fc9e0f..1005b219410 100644 --- a/3rdparty/zlib/win32/VisualC.txt +++ b/3rdparty/zlib/win32/VisualC.txt @@ -1,3 +1,3 @@ To build zlib using the Microsoft Visual C++ environment, -use the appropriate project from the projects/ directory. +use the appropriate project from the contrib/vstudio/ directory. diff --git a/3rdparty/zlib/win32/zlib1.rc b/3rdparty/zlib/win32/zlib1.rc index 5c0feed1b44..234e641c329 100644 --- a/3rdparty/zlib/win32/zlib1.rc +++ b/3rdparty/zlib/win32/zlib1.rc @@ -26,7 +26,7 @@ BEGIN VALUE "FileDescription", "zlib data compression library\0" VALUE "FileVersion", ZLIB_VERSION "\0" VALUE "InternalName", "zlib1.dll\0" - VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0" + VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0" VALUE "OriginalFilename", "zlib1.dll\0" VALUE "ProductName", "zlib\0" VALUE "ProductVersion", ZLIB_VERSION "\0" |