changeset 3908:fb494039358f icedtea-3.12.0

Merge jdk8u212-b04
author andrew
date Thu, 18 Apr 2019 03:46:19 +0100
parents 6343432c6326 (current diff) 8aab93346792 (diff)
children a59f1978e2cf
files .hgtags
diffstat 2 files changed, 15 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Apr 17 03:47:22 2019 +0100
+++ b/.hgtags	Thu Apr 18 03:46:19 2019 +0100
@@ -1026,6 +1026,11 @@
 dd3348cbc2d0651582fa8ede11c58e6bdd365c61 jdk8u201-b77
 8c8f74830128f0b244d878920df032e704d35eee jdk8u201-b08
 78414f4f0172bf37926faeefe54df0b7f8381d0d icedtea-3.11.0
+689d7755e8c17c5e18a8b86e01e4064695e74ee5 jdk8u201-b09
+7d4b8157ceddfc1adacdf1fe8fd35d7ec10b7a9b jdk8u201-b79
+4466875577d86dd5c16a9f6885909ba831653acb jdk8u201-b25
+60ed5e6cf44f898046eac40f66bf41c8e753c8e1 jdk8u201-b26
+689d7755e8c17c5e18a8b86e01e4064695e74ee5 jdk8u201-ga
 29d5186cdb7c5c0a47de00e6487ccaa1dffd85a6 jdk8u202-b01
 6be61de8b2a753b117c525dfefb7f357036e0da2 jdk8u202-b02
 0f0df1c7190a7435d796b268d152883c7b86a821 jdk8u202-b03
@@ -1035,3 +1040,13 @@
 d050098ff289bdf42e642fff35a11a15e377624e jdk8u202-b07
 517f10ee596b8498986ee09e4c3c25793202d889 icedtea-3.12.0pre01
 78414f4f0172bf37926faeefe54df0b7f8381d0d icedtea-3.12.0pre00
+95f8837bfbdc0da195c6ab9a32b97921cc2dd292 jdk8u202-b08
+15d8c732039b3537a3ec774b6c8df5af3fd71b57 jdk8u202-b25
+c0f526208190beea95ec99b06655603537c761f0 jdk8u202-b26
+95f8837bfbdc0da195c6ab9a32b97921cc2dd292 jdk8u202-ga
+075120a8b410485605fffd5bef20ab66ed97bef8 jdk8u212-b00
+f301c2612d6092ca64b0ba1807a07cf25941bc3b jdk8u212-b01
+59ab73ca14e84b4970ac1feb1ddb3f3d9a087d81 jdk8u212-b02
+4c4c8a86bcb2130dca9581a9aad6a60c01bfeeb0 jdk8u212-b03
+075e7154cddf75a861c657c6177797fdfbf36d3f jdk8u212-b04
+4c4c8a86bcb2130dca9581a9aad6a60c01bfeeb0 jdk8u212-ga
--- a/THIRD_PARTY_README	Wed Apr 17 03:47:22 2019 +0100
+++ b/THIRD_PARTY_README	Thu Apr 18 03:46:19 2019 +0100
@@ -1096,33 +1096,6 @@
 OF SUCH DAMAGE.
 --- end of LICENSE ---
 
-%% This notice is provided with respect to FontConfig 2.5, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8 source distributions on
-Linux and Solaris.
-
---- begin of LICENSE ---
-
-Copyright ?? 2001,2003 Keith Packard
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that the
-above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and that
-the name of Keith Packard not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior permission.
-Keith Packard makes no representations about the suitability of this software
-for any purpose.  It is provided "as is" without express or implied warranty.
-
-KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL KEITH
-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
---- end of LICENSE ---
-
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to freebXML Registry 3.0 & 3.1,