changeset 1602:f47ccd58ac92

Merge
author amurillo
date Fri, 31 Jul 2015 10:15:01 -0700
parents d82072b699b8 (diff) 2671addb3319 (current diff)
children cf76386db5c7 4e98d455d12d
files
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jul 28 19:20:33 2015 +0200
+++ b/.hgtags	Fri Jul 31 10:15:01 2015 -0700
@@ -317,3 +317,4 @@
 8582c35016fb6211b373810b6b172feccf9c483b jdk9-b72
 4c2cbaae528bce970dabbb5676005d379357f4b6 jdk9-b73
 57f3134853ecdd4a3ee2d4d26f22ba981d653d79 jdk9-b74
+8fd6eeb878606e39c908f12535f34ebbfd225a4a jdk9-b75
--- a/modules.xml	Tue Jul 28 19:20:33 2015 +0200
+++ b/modules.xml	Fri Jul 31 10:15:01 2015 -0700
@@ -1565,6 +1565,10 @@
       <to>jdk.javadoc</to>
     </export>
     <export>
+      <name>com.sun.tools.javac.platform</name>
+      <to>jdk.javadoc</to>
+    </export>
+    <export>
       <name>com.sun.tools.javac.sym</name>
       <to>jdk.javadoc</to>
     </export>