changeset 1969:4dee0def390a icedtea-3.15.0 icedtea-3.16.0pre00

Merge jdk8u242-ga
author andrew
date Mon, 20 Jan 2020 01:16:56 +0000
parents beb60776ae3a (current diff) 9a279c7bc1a2 (diff)
children 921946c2781b
files .hgtags
diffstat 2 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Dec 24 20:24:03 2019 +0000
+++ b/.hgtags	Mon Jan 20 01:16:56 2020 +0000
@@ -1075,3 +1075,12 @@
 af5760dceec09e6fe40f32998d069bd8fe931a99 icedtea-3.14.0
 af5760dceec09e6fe40f32998d069bd8fe931a99 icedtea-3.15.0pre00
 57ce5f4e53b1f7a01c1df0d4448ad0b7220a0e86 icedtea-3.15.0pre01
+3a911ec83c7e3786a95e3778dc459926b1c9775e jdk8u242-b01
+016be7bdaa27e14de8e40db8c67d0ab3997d5dc7 jdk8u242-b02
+6f53efc6747b8be967b6919ce83426924ae6b79e jdk8u242-b03
+b1722cc8c8d85ad8baac1469831a02b5c85f6c7a jdk8u242-b04
+c00877a0e915474c530fe45b68d8af8cbb245abf jdk8u242-b05
+a82b6ab00878ea389c4e03cbab0c01e7b2ffc257 jdk8u242-b06
+888c7a41a3ece3f502aa12b17fbd4625bc217c0f jdk8u242-b07
+b933b8903615c12824dc12ae493dc213e6f07c43 jdk8u242-b08
+b933b8903615c12824dc12ae493dc213e6f07c43 jdk8u242-ga
--- a/THIRD_PARTY_README	Tue Dec 24 20:24:03 2019 +0000
+++ b/THIRD_PARTY_README	Mon Jan 20 01:16:56 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