Mercurial > hg > openjdk > bsd-port
changeset 1350:51a888af0d22 default tip
Merge from main OpenJDK repository
| author | Greg Lewis <glewis@eyesbeyond.com> |
|---|---|
| date | Sat, 03 Feb 2018 14:01:46 -0800 |
| parents | ddfd21400726 (current diff) 83e0c1100ed2 (diff) |
| children | |
| files | .hgtags |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Sep 07 23:37:08 2017 -0700 +++ b/.hgtags Sat Feb 03 14:01:46 2018 -0800 @@ -614,3 +614,5 @@ db8fe12e5e508b18dd0aeb166099406a774b0d04 jdk7u141-b02 ae6c3762cdc9b1610211cd1ad1a29ed1a7f8471e jdk7u151-b00 c63b09823b9fa0ddeb37c1ac534569a9227c5bf6 jdk7u151-b01 +a1aa7e729c1ad05387f5cb744c6cbd008414c600 jdk7u161-b00 +0b57654ed07146c81b2c7ecf3afa2cc1fae49e22 jdk7u161-b01
--- a/THIRD_PARTY_README Thu Sep 07 23:37:08 2017 -0700 +++ b/THIRD_PARTY_README Sat Feb 03 14:01:46 2018 -0800 @@ -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