# HG changeset patch # User duke # Date 1499279374 -7200 # Node ID 42d52a9eecbda5f2a5a437ea2d3edf1988ca0045 # Parent d9c8742b7f8a924c5946e92ac5ccd806b0e1634e# Parent 4440a52322d58d59dfc050ef474f781f4318509f Merge diff -r d9c8742b7f8a -r 42d52a9eecbd .hgtags-top-repo --- a/.hgtags-top-repo Thu Apr 23 16:11:17 2015 -0700 +++ b/.hgtags-top-repo Wed Jul 05 20:29:34 2017 +0200 @@ -303,3 +303,4 @@ 6e78dd9b121037719a065fe8fb25b936babdfecb jdk9-b58 39e8a131289e8386aa4c3e4b184faa812a7c0421 jdk9-b59 9fa2185bee17462d1014538bff60af6e6f0b01e7 jdk9-b60 +ea38728b4f4bdd8fd0d7a89b18069f521cf05013 jdk9-b61 diff -r d9c8742b7f8a -r 42d52a9eecbd make/Images.gmk --- a/make/Images.gmk Thu Apr 23 16:11:17 2015 -0700 +++ b/make/Images.gmk Wed Jul 05 20:29:34 2017 +0200 @@ -38,7 +38,7 @@ ############################################################################ MAIN_MODULES += java.se java.smartcardio jdk.httpserver jdk.sctp \ - jdk.security.auth jdk.security.jgss jdk.pack200 + jdk.security.auth jdk.security.jgss jdk.pack200 jdk.xml.dom # providers PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk.localedata \