Merge
authorduke
Wed, 05 Jul 2017 16:50:29 +0200
changeset 2413 d9bd989cbc46
parent 2412 31bec7a68275 (diff)
parent 2411 4d67fc8e6bb1 (current diff)
child 2415 b273ee3f0e8e
Merge
jdk/src/windows/classes/sun/awt/windows/fontconfig.98.properties
jdk/src/windows/classes/sun/awt/windows/fontconfig.Me.properties
--- a/jaxp/.hgtags	Wed Jul 05 16:50:26 2017 +0200
+++ b/jaxp/.hgtags	Wed Jul 05 16:50:29 2017 +0200
@@ -27,3 +27,4 @@
 e8514e2be76d90889ebdb90d627aca2db5c150c6 jdk7-b50
 ae890d80d5dffcd4dc77a1f17d768e192d1852c7 jdk7-b51
 69ad87dc25cbcaaaded4727199395ad0c78bc427 jdk7-b52
+e8837366d3fd72f7c7a47ebfdbd5106c16156f12 jdk7-b53