changeset 1936:eb465c89d643

Merge
author ddehaven
date Tue, 02 Feb 2016 10:03:09 -0800
parents c2696ab4abae b3b0381b1ab0
children 6b11a2e9fa4f
files common/autoconf/generated-configure.sh modules.xml
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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>