changeset 2484:2b6a983d2ccc jdk8u212-b04-aarch32-190429

Merge
author andrew
date Sat, 27 Apr 2019 17:07:31 +0100
parents 94ba2437de09 (current diff) 8bbcc2375d0c (diff)
children f4d1e9e72365
files .hgtags
diffstat 2 files changed, 15 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jan 24 16:43:03 2019 +0300
+++ b/.hgtags	Sat Apr 27 17:07:31 2019 +0100
@@ -1024,6 +1024,11 @@
 38568172fbddb5177ff805ec1634da54c8ec2daa jdk8u201-b77
 03dc179691c8b481cf97869cdb65047515ec5b11 jdk8u201-b08
 90c0d4abb1c3220bae4e36f8b0da49a1f789bca8 jdk8u201-b09-aarch32-190124
+bf5c40b0e9d80c21a8aeecf73f0714b12a89f527 jdk8u201-b09
+cd4430c469bf768cbb68c6b3e9b99d061cb35e5b jdk8u201-b79
+5a876140bff867833dd33b7a610d9589803de894 jdk8u201-b25
+694869cbd8b05f17cbadb00b16da81c964f23547 jdk8u201-b26
+bf5c40b0e9d80c21a8aeecf73f0714b12a89f527 jdk8u201-ga
 b347bb8a4cab083701144cc4e1f438b46431fd44 jdk8u202-b01
 e8555da505ce7b81d620ea389c021313015f2715 jdk8u202-b02
 e9280b15cfa8da6be9c42a9cce793242db4e197a jdk8u202-b03
@@ -1032,3 +1037,13 @@
 b16b59c5f123fa516e71d5636e582ae6a935e974 jdk8u202-b06
 898989e3b02d0663a0a0386ce4f5397fe7867a79 jdk8u202-b07
 95eba4d3cc9b3d6c1c540e73e05b15e238074b90 jdk8u202-b08-aarch32-190124
+7aeae6eb62362bd676ed9f809d8fa1c12295a843 jdk8u202-b08
+7e3753cfb0766f2f404efad48758d6c0c6d493e9 jdk8u202-b25
+513bdfdab61ccae75ceb3df1d5e656d32e65e1dc jdk8u202-b26
+7aeae6eb62362bd676ed9f809d8fa1c12295a843 jdk8u202-ga
+8949d12e49e32711a0fb4079e2da7eb4f9ee426b jdk8u212-b00
+203712f71207bc1ed45ef9c3f4c11d367699e2d0 jdk8u212-b01
+8fa8a4821ec34b99c3dcfd5f6a67fba0813e7bbe jdk8u212-b02
+f470f90fa4f757ea435ad48def6146f6a35bdee3 jdk8u212-b03
+32c18a79003ad846811955f7348ea73061e91c40 jdk8u212-b04
+f470f90fa4f757ea435ad48def6146f6a35bdee3 jdk8u212-ga
--- a/THIRD_PARTY_README	Thu Jan 24 16:43:03 2019 +0300
+++ b/THIRD_PARTY_README	Sat Apr 27 17:07:31 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,