Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorddehaven
Tue, 02 Feb 2016 10:03:09 -0800
changeset 35447 00f226dd004b
parent 35444 4d323e794486 (current diff)
parent 35446 eb27957fdad2 (diff)
child 35448 7b192a9969f7
Merge
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
modules.xml file | annotate | diff | comparison | revisions 
--- a/common/autoconf/generated-configure.sh	Tue Feb 02 15:02:55 2016 +0100
+++ b/common/autoconf/generated-configure.sh	Tue Feb 02 10:03:09 2016 -0800
@@ -4836,7 +4836,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1454421750
+DATE_WHEN_GENERATED=1454436146
 
 ###############################################################################
 #
--- a/modules.xml	Tue Feb 02 15:02:55 2016 +0100
+++ b/modules.xml	Tue Feb 02 10:03:09 2016 -0800
@@ -274,6 +274,10 @@
       <to>jdk.scripting.nashorn</to>
     </export>
     <export>
+      <name>jdk.internal.ref</name>
+      <to>java.desktop</to>
+    </export>
+    <export>
       <name>jdk.internal</name>
       <to>jdk.jfr</to>
     </export>
jdk-sandbox