changeset 2610:c0ec72b715dd icedtea-3.15.0 icedtea-3.16.0pre00

Merge jdk8u242-ga
author andrew
date Mon, 20 Jan 2020 01:16:52 +0000
parents 001f74caed55 (current diff) 3818ce58ca67 (diff)
children b02ea3ddfab2
files .hgtags
diffstat 2 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Dec 24 20:24:07 2019 +0000
+++ b/.hgtags	Mon Jan 20 01:16:52 2020 +0000
@@ -1044,3 +1044,12 @@
 454c6cbb807370381b734f7cb9fb91c8117ebd30 icedtea-3.14.0
 454c6cbb807370381b734f7cb9fb91c8117ebd30 icedtea-3.15.0pre00
 c93ffb58d0ac9f64c06f44cc025739592869bed2 icedtea-3.15.0pre01
+34aa7bcd731f29c1a37aad70a5f07272a3fa9ca7 jdk8u242-b01
+d2079934980013fdd8e63e31897011edae1a1188 jdk8u242-b02
+be3a6b2c79821f056a9ca1efde037555d829ccb8 jdk8u242-b03
+813d61736302c853dd0ef1b1e92b8fd0ca0af123 jdk8u242-b04
+bb4532c15611d35d3136eeb287049da79ce01ebb jdk8u242-b05
+72443ad60b1e685bd50e7ec8f21adf66786863d1 jdk8u242-b06
+8ca5f59e3042b7353b64c131be6bb970ba489ce9 jdk8u242-b07
+5b17d1f49219624f122ea2b05ec1c9f1adff8c64 jdk8u242-b08
+5b17d1f49219624f122ea2b05ec1c9f1adff8c64 jdk8u242-ga
--- a/THIRD_PARTY_README	Tue Dec 24 20:24:07 2019 +0000
+++ b/THIRD_PARTY_README	Mon Jan 20 01:16:52 2020 +0000
@@ -1334,11 +1334,13 @@
 
 --------------------------------------------------------------------------------
 
-%% This notice is provided with respect to Joni v1.1.9, which may be 
+%% This notice is provided with respect to Joni v2.1.16, which may be
 included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
+Copyright (c) 2017 JRuby Team
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights