Mercurial > hg > icedtea8-forest > corba
changeset 2065:f59374a41938 icedtea-3.15.0 icedtea-3.16.0pre00
Merge jdk8u242-ga
author | andrew |
---|---|
date | Mon, 20 Jan 2020 01:16:54 +0000 |
parents | 650620598a2d (current diff) acde26acdc0a (diff) |
children | 889b31723215 |
files | .hgtags |
diffstat | 2 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Dec 24 20:24:01 2019 +0000 +++ b/.hgtags Mon Jan 20 01:16:54 2020 +0000 @@ -1117,3 +1117,12 @@ a37140ba122db1b11f0a239d8067f18a78faeaf6 icedtea-3.14.0 a37140ba122db1b11f0a239d8067f18a78faeaf6 icedtea-3.15.0pre00 031939f0854bc3d0a9377c574eed674f443faf4c icedtea-3.15.0pre01 +d4d4f7f07a863fd30db8911421ef45db4a6ad5dd jdk8u242-b01 +b3fbd77f16f6744939621dd68c18cb310f9a6e8d jdk8u242-b02 +89f67ddac3c9a8307156a7a1963d184ecd97efe0 jdk8u242-b03 +1835a96a04a6cf83449507245f5c4b12395d0cf5 jdk8u242-b04 +69e526db7430472a95cb9c43d928a8eb00faaf27 jdk8u242-b05 +751146fda0429aeb6501620cdcfa021d469613f1 jdk8u242-b06 +72d4f7e239eec808290ee6e1ab99dfab88d66150 jdk8u242-b07 +bdd855313cfed15bb2d6bd567c0487313752bcb2 jdk8u242-b08 +bdd855313cfed15bb2d6bd567c0487313752bcb2 jdk8u242-ga
--- a/THIRD_PARTY_README Tue Dec 24 20:24:01 2019 +0000 +++ b/THIRD_PARTY_README Mon Jan 20 01:16:54 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