changeset 1913:d4d4f7f07a86 jdk8u242-b01

Merge
author andrew
date Thu, 17 Oct 2019 13:46:56 +0100
parents 75fe7bdb490f 870b3cd9fc18
children b3fbd77f16f6
files .hgtags
diffstat 2 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Sep 12 15:20:55 2019 -0400
+++ b/.hgtags	Thu Oct 17 13:46:56 2019 +0100
@@ -1047,3 +1047,8 @@
 1447921be8023aec0684019e349a42e92f302fb7 jdk8u232-b04
 836e5e2e10a55e1ed49ee002dbe9d974a4b32859 jdk8u232-b05
 75ad72ef4f68ca6a734ac2e44b9aadd8c10f8206 jdk8u242-b00
+3fc52164727a38a74abceb9b9b84cd2396049c12 jdk8u232-b06
+af5f5e2e07bc12472ffb52951120e14e19690b1a jdk8u232-b07
+def9640e5d8213f650c128330161d9cdcd04d96b jdk8u232-b08
+3cdc7d41905a2808bb01c3503e119073e9df0898 jdk8u232-b09
+3cdc7d41905a2808bb01c3503e119073e9df0898 jdk8u232-ga
--- a/THIRD_PARTY_README	Thu Sep 12 15:20:55 2019 -0400
+++ b/THIRD_PARTY_README	Thu Oct 17 13:46:56 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