Mercurial > hg > release > icedtea7-forest-2.6
changeset 1449:0a7eb50f7aba
Merge jdk7u161-b00
| author | andrew |
|---|---|
| date | Mon, 27 Nov 2017 06:51:23 +0000 |
| parents | 16dda073fd69 (current diff) 0b57654ed071 (diff) |
| children | 7d977b31457d |
| files | .hgtags |
| diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Nov 20 15:20:11 2017 +0000 +++ b/.hgtags Mon Nov 27 06:51:23 2017 +0000 @@ -674,3 +674,4 @@ c63b09823b9fa0ddeb37c1ac534569a9227c5bf6 jdk7u151-b01 499e7894cc4485715dbcc4f1d7436feda0668b70 icedtea-2.6.11 f53c56dda66385af2679e1f7e85b7cbe91aef52c icedtea-2.6.12pre01 +a1aa7e729c1ad05387f5cb744c6cbd008414c600 jdk7u161-b00
--- a/THIRD_PARTY_README Mon Nov 20 15:20:11 2017 +0000 +++ b/THIRD_PARTY_README Mon Nov 27 06:51:23 2017 +0000 @@ -3134,14 +3134,14 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to zlib v1.2.3, which is included +%% This notice is provided with respect to zlib v1.2.11, which may be included with JRE 7, JDK 7, and OpenJDK 7 --- begin of LICENSE --- - version 1.2.3, July 18th, 2005 - - Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler + version 1.2.11, January 15th, 2017 + + Copyright (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