changeset 1956:3a911ec83c7e jdk8u242-b01

Merge
author andrew
date Thu, 17 Oct 2019 13:47:38 +0100
parents 55ba417a94a3 (current diff) 12a8cc271ea2 (diff)
children 57ce5f4e53b1 016be7bdaa27
files .hgtags
diffstat 2 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Sep 12 15:22:06 2019 -0400
+++ b/.hgtags	Thu Oct 17 13:47:38 2019 +0100
@@ -1005,3 +1005,8 @@
 d8ecedf2321baf12d62c992f7e92bdfb52f48631 jdk8u232-b04
 298981215ad0df664eebe5b44ce93c07c6d3e7c5 jdk8u232-b05
 60e3a82a99730978f4dcd67fcd7a52c6de5fdaba jdk8u242-b00
+7261667ae4ff188688bf91a35779ccc05ac1d0e2 jdk8u232-b06
+fb3b24b266a254727e88edaa3a7211a2de6c74db jdk8u232-b07
+65b391f0ed666750478e3fc887c6a6c383190d30 jdk8u232-b08
+5f799cd7fe51a1c0fab3c079f59b368853ba02c4 jdk8u232-b09
+5f799cd7fe51a1c0fab3c079f59b368853ba02c4 jdk8u232-ga
--- a/THIRD_PARTY_README	Thu Sep 12 15:22:06 2019 -0400
+++ b/THIRD_PARTY_README	Thu Oct 17 13:47:38 2019 +0100
@@ -2130,13 +2130,13 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1,
+%% This notice is provided with respect to PC/SC Lite v1.8.24,
 which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
 
 --- begin of LICENSE ---
 
-Copyright (c) 1999-2004 David Corcoran <corcoran@linuxnet.com>
-Copyright (c) 1999-2004 Ludovic Rousseau <ludovic.rousseau (at) free.fr>
+Copyright (c) 1999-2003 David Corcoran <corcoran@linuxnet.com>
+Copyright (c) 2001-2011 Ludovic Rousseau <ludovic.rousseau@free.fr>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -2148,15 +2148,10 @@
 2. Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-     This product includes software developed by: 
-      David Corcoran <corcoran@linuxnet.com>
-      http://www.linuxnet.com (MUSCLE)
-4. The name of the author may not be used to endorse or promote products
+3. The name of the author may not be used to endorse or promote products
    derived from this software without specific prior written permission.
 
-Changes to this license can be made only by the copyright author with 
+Changes to this license can be made only by the copyright author with
 explicit written consent.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR