Merge jdk8u242-b01

Thu, 17 Oct 2019 13:47:38 +0100

author
andrew
date
Thu, 17 Oct 2019 13:47:38 +0100
changeset 1841
3a911ec83c7e
parent 1840
55ba417a94a3
parent 1838
12a8cc271ea2
child 1842
016be7bdaa27

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Thu Sep 12 15:22:06 2019 -0400
     1.2 +++ b/.hgtags	Thu Oct 17 13:47:38 2019 +0100
     1.3 @@ -1005,3 +1005,8 @@
     1.4  d8ecedf2321baf12d62c992f7e92bdfb52f48631 jdk8u232-b04
     1.5  298981215ad0df664eebe5b44ce93c07c6d3e7c5 jdk8u232-b05
     1.6  60e3a82a99730978f4dcd67fcd7a52c6de5fdaba jdk8u242-b00
     1.7 +7261667ae4ff188688bf91a35779ccc05ac1d0e2 jdk8u232-b06
     1.8 +fb3b24b266a254727e88edaa3a7211a2de6c74db jdk8u232-b07
     1.9 +65b391f0ed666750478e3fc887c6a6c383190d30 jdk8u232-b08
    1.10 +5f799cd7fe51a1c0fab3c079f59b368853ba02c4 jdk8u232-b09
    1.11 +5f799cd7fe51a1c0fab3c079f59b368853ba02c4 jdk8u232-ga
     2.1 --- a/THIRD_PARTY_README	Thu Sep 12 15:22:06 2019 -0400
     2.2 +++ b/THIRD_PARTY_README	Thu Oct 17 13:47:38 2019 +0100
     2.3 @@ -2130,13 +2130,13 @@
     2.4  
     2.5  -------------------------------------------------------------------------------
     2.6  
     2.7 -%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1,
     2.8 +%% This notice is provided with respect to PC/SC Lite v1.8.24,
     2.9  which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
    2.10  
    2.11  --- begin of LICENSE ---
    2.12  
    2.13 -Copyright (c) 1999-2004 David Corcoran <corcoran@linuxnet.com>
    2.14 -Copyright (c) 1999-2004 Ludovic Rousseau <ludovic.rousseau (at) free.fr>
    2.15 +Copyright (c) 1999-2003 David Corcoran <corcoran@linuxnet.com>
    2.16 +Copyright (c) 2001-2011 Ludovic Rousseau <ludovic.rousseau@free.fr>
    2.17  All rights reserved.
    2.18  
    2.19  Redistribution and use in source and binary forms, with or without
    2.20 @@ -2148,15 +2148,10 @@
    2.21  2. Redistributions in binary form must reproduce the above copyright
    2.22     notice, this list of conditions and the following disclaimer in the
    2.23     documentation and/or other materials provided with the distribution.
    2.24 -3. All advertising materials mentioning features or use of this software
    2.25 -   must display the following acknowledgement:
    2.26 -     This product includes software developed by: 
    2.27 -      David Corcoran <corcoran@linuxnet.com>
    2.28 -      http://www.linuxnet.com (MUSCLE)
    2.29 -4. The name of the author may not be used to endorse or promote products
    2.30 +3. The name of the author may not be used to endorse or promote products
    2.31     derived from this software without specific prior written permission.
    2.32  
    2.33 -Changes to this license can be made only by the copyright author with 
    2.34 +Changes to this license can be made only by the copyright author with
    2.35  explicit written consent.
    2.36  
    2.37  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

mercurial