Merge mips-jdk8u262-b10

Wed, 14 Oct 2020 17:44:46 +0800

author
aoqi
date
Wed, 14 Oct 2020 17:44:46 +0800
changeset 3902
0c0a27687e23
parent 3884
e1c176108b65
parent 3901
fd4d3f8b2c2d
child 3903
e35b261f5d37

Merge

.hgtags file | annotate | diff | comparison | revisions
THIRD_PARTY_README file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Wed Oct 14 16:43:13 2020 +0800
     1.2 +++ b/.hgtags	Wed Oct 14 17:44:46 2020 +0800
     1.3 @@ -1057,8 +1057,20 @@
     1.4  665990488f3d9dbaef06f04e0383bfecf2d0e031 jdk8u252-b03
     1.5  549e692228104960d813458d274aa5ec7bf8d125 jdk8u252-b04
     1.6  4d4304fcc0cc49e1b4257fb9dce8b96e2da9dcbe jdk8u252-b05
     1.7 +4d4304fcc0cc49e1b4257fb9dce8b96e2da9dcbe jdk8u262-b00
     1.8  4010269cf4965f6e6efc402b6d3f5e1dc8957a9e jdk8u252-b06
     1.9  8ce7c29ca85c77147edd0123d3393fabd351685e jdk8u252-b07
    1.10  c56eceecec71d0b7f8af742ba33b50a3128de58f jdk8u252-b08
    1.11 +01036da3155c1ff6f5a92eab0b8be842148258f3 jdk8u252-b09
    1.12 +01036da3155c1ff6f5a92eab0b8be842148258f3 jdk8u252-ga
    1.13  2c252f917e8920bfb49900639a39f4e9c7241a4f mips64el-jdk8u252-b10
    1.14  35caf2f8b9d665a01c0e559ba809cba3c0b4f295 mips64el-jdk8u252-b11
    1.15 +05fc0d4d4fbe10508ed18e2f64f42ca16a71306f jdk8u262-b01
    1.16 +910ec7999bd5c01dc979ea99604d5122e465ad34 jdk8u262-b02
    1.17 +6df22f7cfdf1154526a79982cb99fbd7684b0bbd jdk8u262-b03
    1.18 +094173db293ac68326b38333a3570bdb0d407b43 jdk8u262-b04
    1.19 +07fc22e7080d7440c5e8bea06dc36548bcb065b2 jdk8u262-b05
    1.20 +26690d83c12ed384b919f7c67b70d2000f999bdf jdk8u262-b06
    1.21 +774e6c9b92965430835ea842724348c39692c542 jdk8u262-b07
    1.22 +ac5fce89162167996468e6466abe5cfcc8185bde jdk8u262-b08
    1.23 +747fe2026aa872ee5444e6c24653d054b1aef58c jdk8u262-b09
     2.1 --- a/THIRD_PARTY_README	Wed Oct 14 16:43:13 2020 +0800
     2.2 +++ b/THIRD_PARTY_README	Wed Oct 14 17:44:46 2020 +0800
     2.3 @@ -1643,7 +1643,7 @@
     2.4  
     2.5  -------------------------------------------------------------------------------
     2.6  
     2.7 -%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3, 
     2.8 +%% This notice is provided with respect to GIFLIB 5.2.1 & libungif 4.1.3, 
     2.9  which may be included with JRE 8, JDK 8, and OpenJDK 8.
    2.10  
    2.11  --- begin of LICENSE ---
    2.12 @@ -2898,23 +2898,21 @@
    2.13  
    2.14  -------------------------------------------------------------------------------
    2.15  
    2.16 -%% This notice is provided with respect to X Window System 6.8.2, which may be 
    2.17 +%% This notice is provided with respect to xwd v1.0.7, which may be
    2.18  included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
    2.19  
    2.20 +xwd utility
    2.21 +
    2.22  --- begin of LICENSE ---
    2.23  
    2.24 -This is the copyright for the files in src/solaris/native/sun/awt: list.h, 
    2.25 -multiVis.h, wsutils.h, list.c, multiVis.c
    2.26 -Copyright (c) 1994 Hewlett-Packard Co.
    2.27 -Copyright (c) 1996 X Consortium
    2.28 -
    2.29 -Permission is hereby granted, free of charge, to any person obtaining
    2.30 -a copy of this software and associated documentation files (the
    2.31 -"Software"), to deal in the Software without restriction, including
    2.32 -without limitation the rights to use, copy, modify, merge, publish,
    2.33 -distribute, sublicense, and sell copies of the Software, and to
    2.34 -permit persons to whom the Software is furnished to do so, subject to
    2.35 -the following conditions:
    2.36 +Copyright 1994 Hewlett-Packard Co.
    2.37 +Copyright 1996, 1998  The Open Group
    2.38 +
    2.39 +Permission to use, copy, modify, distribute, and sell this software and its
    2.40 +documentation for any purpose is hereby granted without fee, provided that
    2.41 +the above copyright notice appear in all copies and that both that
    2.42 +copyright notice and this permission notice appear in supporting
    2.43 +documentation.
    2.44  
    2.45  The above copyright notice and this permission notice shall be included
    2.46  in all copies or substantial portions of the Software.
    2.47 @@ -2922,15 +2920,15 @@
    2.48  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
    2.49  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
    2.50  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
    2.51 -IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
    2.52 +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
    2.53  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
    2.54  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
    2.55  OTHER DEALINGS IN THE SOFTWARE.
    2.56  
    2.57 -Except as contained in this notice, the name of the X Consortium shall
    2.58 +Except as contained in this notice, the name of The Open Group shall
    2.59  not be used in advertising or otherwise to promote the sale, use or
    2.60  other dealings in this Software without prior written authorization
    2.61 -from the X Consortium.
    2.62 +from The Open Group.
    2.63  
    2.64  --- end of LICENSE ---
    2.65  _____________________________

mercurial