# HG changeset patch
# User aoqi
# Date 1562157699 -28800
# Node ID 22faaede23769cb50c3d9ef5f34cd2d273ed369d
# Parent  773b4d84e4b0ff41207f01b20a717607ae71dfb5# Parent  edd8659683b4aeca051e32f9a9da2c6c1f4c1313
Merge

diff -r 773b4d84e4b0 -r 22faaede2376 .hgtags
--- a/.hgtags	Wed Jul 03 20:04:13 2019 +0800
+++ b/.hgtags	Wed Jul 03 20:41:39 2019 +0800
@@ -979,6 +979,11 @@
 50f48f1d242d36f9f0bf2da0a075037467488207 jdk8u201-b07
 8396aa331353d281ebd65054159268456a482718 jdk8u201-b77
 8485292c47007c567bdc055d66b8b22486c7014f jdk8u201-b08
+05542ff5d183b9dba079abd407acddf7d42069a0 jdk8u201-b09
+ec98fab8b31a36cee3c0c547589b3f58d113d1da jdk8u201-b79
+636a528d16b81cff34a5fdfdf812cc1f0bc73585 jdk8u201-b25
+0e9ea4e611870472ba1b4bbd565b723c331572e3 jdk8u201-b26
+05542ff5d183b9dba079abd407acddf7d42069a0 jdk8u201-ga
 761258c45a3a7b0ab2a3b9e9ab23e6783ae48b61 jdk8u202-b01
 691079f04a6f4c16ef5a017e86c58dd3b37f0b1a jdk8u202-b02
 2b50ba9b5d20cb0fdc70d98a41d7d3d439ca0cea jdk8u202-b03
@@ -989,3 +994,9 @@
 99fbc435f2faedf1dd68e80d679ebf4abd8c98c9 jdk8u202-b08
 c5e2e9bb4f9ea3c6c2345d1e3dd8c8dd461e85f0 mips64el-jdk8u202-b09
 dbd6eda408b6a85fccfa3380275e2c1ae31a1538 mips64el-jdk8u202-b10
+a51e13337c7b4575acf7930ebf80ccbfc405fa17 jdk8u202-b25
+81d8126f05e5290e3974d4f3ea7360481676a78c jdk8u202-b26
+99fbc435f2faedf1dd68e80d679ebf4abd8c98c9 jdk8u202-ga
+d5402443e9392243c6de6b6d7d7453364d7f9dc1 jdk8u212-b00
+5f9530ebac26be622a64638b669ba13030a6a2b2 jdk8u212-b01
+b6ace99fbdc10bac6c84b0dbce5bfee6d13e2888 jdk8u212-b02
diff -r 773b4d84e4b0 -r 22faaede2376 THIRD_PARTY_README
--- a/THIRD_PARTY_README	Wed Jul 03 20:04:13 2019 +0800
+++ b/THIRD_PARTY_README	Wed Jul 03 20:41:39 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,