diff options
author | Dana Dahlstrom <dahlstrom@google.com> | 2019-07-25 22:00:00 -0700 |
---|---|---|
committer | Dana Dahlstrom <dahlstrom@google.com> | 2019-07-25 22:00:00 -0700 |
commit | c4092eb09e607234089c36078d714505734fcf90 (patch) | |
tree | c5608ed0c191d8ab8d933199ab327e3e2bbf98e4 | |
parent | 80c540e7f56cfa82d3f7ff1ed0588176ca4b6f9b (diff) | |
parent | 4128dc14fcf1119385f1928c9228c02b35c2392b (diff) | |
download | jdk8u_corba-c4092eb09e607234089c36078d714505734fcf90.tar.gz |
Merge tag jb8u212-b1586.4
Change-Id: I4128dc14fcf1119385f1928c9228c02b35c2392b
-rw-r--r-- | .hgtags | 51 | ||||
-rw-r--r-- | THIRD_PARTY_README | 31 |
2 files changed, 53 insertions, 29 deletions
@@ -987,3 +987,54 @@ c26ddd2bd7c0a5ff8c7d358194a760b66c05392e jdk8u192-b11 d70620db70e3ecf0adc76a4721b201d3eb757c59 jdk8u192-b12 a86c7b3fc44025839a24b1ca0f2461ca2e46aee1 jdk8u192-b26 1b45a918aae57c591065d52459584d2fc5032f22 jdk8u202-b01 +4195a7f3fc66ef10e5f3c8e7f20a7d53eb32a629 jdk8u202-b02 +fa3043be158434045b5cc4cf1ccdcd076ed8ad61 jdk8u202-b03 +4fc8654d19b90ceaaf47cc7213f213016c5ae76f jdk8u202-b04 +087876222b3601e04cec0e40d647e6283ab0dc62 jdk8u202-b05 +f13e1bb1c348e587d10aaeed28bd89e1c6624edc jdk8u202-b06 +d10c304f951b97be3947d7bfeb10fd1391b88162 jdk8u202-b07 +6aced976491d8f592e1d102eb222d29ea64fbd84 jdk8u202-b08 +8292032f8f9837bb0244358f5de52ccdf1c608f7 jdk8u202-b25 +e46810124822721115f5bc683fed7d1cb3600290 jdk8u202-b26 +6aced976491d8f592e1d102eb222d29ea64fbd84 jdk8u202-ga +d6e70a820e6b3fe1e832261980df4815bf8227e3 jdk8u181-b31 +0fba5f3cce1f8b94deb6eb30d07f31cbcfce95bb jdk8u181-b32 +99f73e3d73f12c3a9ac73cc1dee7711abe9134b5 jdk8u181-b33 +5b648b564d190e1b0516d2207acfc818ef3678d0 jdk8u181-b34 +9e341ecdf74109b0d74408c00d3bf8d4eb640ff3 jdk8u181-b35 +fdb4bff557900148a88fe31219c118f094899493 jdk8u181-b36 +4a42d89f7ba23707e531881c940f7fa857652244 jdk8u181-b37 +291e5023b0c57ac7b33a287800a7d9a483195615 jdk8u201-b01 +8dc9ee9494c9a29bcb4d20acf7381ed6c292daaa jdk8u201-b02 +637785bfd83280d2bc339f84840c3434f878f24d jdk8u201-b03 +efa05252e6d440ad3fb40260b35addf356c4baf0 jdk8u201-b04 +0b1ad394520ca953c22f31ebe93a6c3b7f0c87e6 jdk8u201-b74 +face39da0a93f96388869584bf1609ce9b488fe5 jdk8u201-b05 +34fa3c008e22657000e3f7038d2d5232f316197c jdk8u201-b75 +7ed32e9e05961cc193f4e282767194c8d7ea4f87 jdk8u201-b06 +0303a8dc582409a1c7f29df60c1d0e8c3ee3762e jdk8u201-b76 +52738cffda5b435fd1e4b89afaacfcbde32aff01 jdk8u201-b07 +c4dc8ca88a3f27a1e2bbe251b8f63957a98ea16f jdk8u201-b77 +a775a126005d8eef56d48a9686e1a1122e5e5dfb jdk8u201-b08 +69ab1163c4bb283eeb07dd126f34926954208da4 jdk8u201-b09 +f0bb83fa5fa8b41f797ba56281e2dc33142d3dbe jdk8u201-b79 +199b0a8ca1692112e929e643e5cdda626eb83995 jdk8u201-b25 +92563b03802d4b34a7025498d316b07d46d417a7 jdk8u201-b26 +69ab1163c4bb283eeb07dd126f34926954208da4 jdk8u201-ga +1b45a918aae57c591065d52459584d2fc5032f22 jdk8u202-b01 +4195a7f3fc66ef10e5f3c8e7f20a7d53eb32a629 jdk8u202-b02 +fa3043be158434045b5cc4cf1ccdcd076ed8ad61 jdk8u202-b03 +4fc8654d19b90ceaaf47cc7213f213016c5ae76f jdk8u202-b04 +087876222b3601e04cec0e40d647e6283ab0dc62 jdk8u202-b05 +f13e1bb1c348e587d10aaeed28bd89e1c6624edc jdk8u202-b06 +d10c304f951b97be3947d7bfeb10fd1391b88162 jdk8u202-b07 +6aced976491d8f592e1d102eb222d29ea64fbd84 jdk8u202-b08 +8292032f8f9837bb0244358f5de52ccdf1c608f7 jdk8u202-b25 +e46810124822721115f5bc683fed7d1cb3600290 jdk8u202-b26 +6aced976491d8f592e1d102eb222d29ea64fbd84 jdk8u202-ga +2a7ec282f0ce1523347a9c9e08189139bfc097db jdk8u212-b00 +e41d4e43109e239cd13219b53798fdad651f63ef jdk8u212-b01 +5d11a79b0bf5560625ec67efd40e9167a594b00d jdk8u212-b02 +b6ed07cab3f88f5ff1c18ff26d27644102b6d63c jdk8u212-b03 +7bcc11914fc5d23b20b9ee7fed6abc140eaab2cf jdk8u212-b04 +b6ed07cab3f88f5ff1c18ff26d27644102b6d63c jdk8u212-ga diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README index a1662fe..2247356 100644 --- a/THIRD_PARTY_README +++ b/THIRD_PARTY_README @@ -1096,33 +1096,6 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 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, @@ -1668,13 +1641,13 @@ THE SOFTWARE. ------------------------------------------------------------------------------- -%% This notice is provided with respect to Little CMS 2.7, which may be +%% This notice is provided with respect to Little CMS 2.9, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- Little CMS -Copyright (c) 1998-2015 Marti Maria Saguer +Copyright (c) 1998-2011 Marti Maria Saguer Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal |