Merge

2017-07-05 18:34:10 +02:00 · 2017-07-05 18:34:10 +02:00 · 30e0acc2eb
commit 30e0acc2eb
parent ca417aacd2 dcbabfcf7b
2 changed files with 3 additions and 1 deletions
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@ -191,3 +191,4 @@ b772de306dc24c17f7bd1398531ddeb58723b804 jdk8-b65
 9a6ec97ec45c1a62d5233cefa91e8390e380e13a jdk8-b67
 cdb401a60cea6ad5ef3f498725ed1decf8dda1ea jdk8-b68
 6ee8080a6efe0639fcd00627a5e0f839bf010481 jdk8-b69
+105a25ffa4a4f0af70188d4371b4a0385009b7ce jdk8-b70
--- a/common/makefiles/javadoc/NON_CORE_PKGS.gmk
+++ b/common/makefiles/javadoc/NON_CORE_PKGS.gmk
@ -78,7 +78,8 @@ ATTACH_PKGS      = com.sun.tools.attach         \

 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