# HG changeset patch
# User aoqi
# Date 1562157681 -28800
# Node ID 5ff6d6bb688cc37a418e4c34e3e734458a43e8c5
# Parent  08c9ebad60092c7bd73909c0f502e5b1949992fc# Parent  b6ed07cab3f88f5ff1c18ff26d27644102b6d63c
Merge

diff -r 08c9ebad6009 -r 5ff6d6bb688c .hgtags
--- a/.hgtags	Wed Jul 03 20:04:13 2019 +0800
+++ b/.hgtags	Wed Jul 03 20:41:21 2019 +0800
@@ -1021,6 +1021,11 @@
 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
@@ -1031,3 +1036,9 @@
 6aced976491d8f592e1d102eb222d29ea64fbd84 jdk8u202-b08
 b9ac9a2c7a70049b272d9448d8e4999fcdb93753 mips64el-jdk8u202-b09
 653b6c1c64813dc481b5f633391dd09c21cca079 mips64el-jdk8u202-b10
+8292032f8f9837bb0244358f5de52ccdf1c608f7 jdk8u202-b25
+e46810124822721115f5bc683fed7d1cb3600290 jdk8u202-b26
+6aced976491d8f592e1d102eb222d29ea64fbd84 jdk8u202-ga
+2a7ec282f0ce1523347a9c9e08189139bfc097db jdk8u212-b00
+e41d4e43109e239cd13219b53798fdad651f63ef jdk8u212-b01
+5d11a79b0bf5560625ec67efd40e9167a594b00d jdk8u212-b02
diff -r 08c9ebad6009 -r 5ff6d6bb688c THIRD_PARTY_README
--- a/THIRD_PARTY_README	Wed Jul 03 20:04:13 2019 +0800
+++ b/THIRD_PARTY_README	Wed Jul 03 20:41:21 2019 +0800
@@ -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,