Mercurial > hg > release > icedtea7-forest-2.6 > langtools
changeset 2246:bdfc28e8f3f3
Merge jdk7u161-b00
| author | andrew |
|---|---|
| date | Mon, 27 Nov 2017 06:51:24 +0000 |
| parents | ef26f84957c5 (current diff) e162e8d76cdd (diff) |
| children | b87dbe0db6aa |
| files | .hgtags |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Nov 20 15:20:10 2017 +0000 +++ b/.hgtags Mon Nov 27 06:51:24 2017 +0000 @@ -676,3 +676,4 @@ 205349c408f4715dbbaf428ceafca676e2333979 jdk7u151-b01 cddb1f9f8b9cee5f9c54ececf59ecb51e1bbb730 icedtea-2.6.11 e24f25323b84858f039ff1a780805ca93dd60af8 icedtea-2.6.12pre01 +6f72d747fa58d54e2d2e27755c0bcf2c7291682f jdk7u161-b00
--- a/THIRD_PARTY_README Mon Nov 20 15:20:10 2017 +0000 +++ b/THIRD_PARTY_README Mon Nov 27 06:51:24 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