Merge
authorduke
Wed, 05 Jul 2017 18:34:10 +0200
changeset 14881 b14a92d8d161
parent 14880 03dafcea1815 (current diff)
parent 14879 456ba4f4c541 (diff)
child 14935 c947486fc44d
Merge
--- a/.hgtags-top-repo	Thu Dec 27 12:14:58 2012 -0800
+++ b/.hgtags-top-repo	Wed Jul 05 18:34:10 2017 +0200
@@ -191,3 +191,4 @@
 9a6ec97ec45c1a62d5233cefa91e8390e380e13a jdk8-b67
 cdb401a60cea6ad5ef3f498725ed1decf8dda1ea jdk8-b68
 6ee8080a6efe0639fcd00627a5e0f839bf010481 jdk8-b69
+105a25ffa4a4f0af70188d4371b4a0385009b7ce jdk8-b70
--- a/common/makefiles/javadoc/NON_CORE_PKGS.gmk	Thu Dec 27 12:14:58 2012 -0800
+++ b/common/makefiles/javadoc/NON_CORE_PKGS.gmk	Wed Jul 05 18:34:10 2017 +0200
@@ -78,7 +78,8 @@
 
 JCONSOLE_PKGS    = com.sun.tools.jconsole
 
-TREEAPI_PKGS 	 = com.sun.source.tree \
+TREEAPI_PKGS 	 = com.sun.source.doctree \
+		   com.sun.source.tree \
 		   com.sun.source.util
 
 SMARTCARDIO_PKGS = javax.smartcardio