changeset 2230:8825b67be6b3

Merge
author amurillo
date Fri, 29 Jul 2016 16:50:45 -0700
parents c96df33e9e4e fef255875620
children 106f2f8b0ec9
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Jul 29 09:23:00 2016 +0200
+++ b/.hgtags	Fri Jul 29 16:50:45 2016 -0700
@@ -371,3 +371,4 @@
 3a58466296d36944454756ef01e7513ac5e14a16 jdk-9+126
 8fa686245bd2a072ece3392743460030f0854520 jdk-9+127
 b30ae794d974d7dd3eb4e84203f70021823fa6c6 jdk-9+128
+f5902d3841b82cac6e7716a20c24e8e916fb14a8 jdk-9+129
--- a/make/common/Modules.gmk	Fri Jul 29 09:23:00 2016 +0200
+++ b/make/common/Modules.gmk	Fri Jul 29 16:50:45 2016 -0700
@@ -58,7 +58,6 @@
     java.security.jgss \
     java.security.sasl \
     java.xml \
-    java.xml.crypto \
     jdk.httpserver \
     jdk.management \
     jdk.net \
@@ -106,6 +105,7 @@
     java.smartcardio \
     java.sql \
     java.sql.rowset \
+    java.xml.crypto \
     jdk.accessibility \
     jdk.charsets \
     jdk.crypto.ec \