changeset 173:5b7439034f3f

Merge
author andrew
date Mon, 25 Jan 2010 14:40:17 +0000
parents 4af4c3784abb (current diff) a3242906c774 (diff)
children ec913dabf4bb
files .hgtags make/Defs-internal.gmk
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Jan 15 17:34:54 2010 +0000
+++ b/.hgtags	Mon Jan 25 14:40:17 2010 +0000
@@ -54,3 +54,4 @@
 c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76
 1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77
 ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78
+20aeeb51713990dbea6929a2e100a8bbf5df70d4 jdk7-b79
--- a/make/Defs-internal.gmk	Fri Jan 15 17:34:54 2010 +0000
+++ b/make/Defs-internal.gmk	Mon Jan 25 14:40:17 2010 +0000
@@ -231,7 +231,7 @@
 ifndef NO_DOCS
   # Default value (we want javadoc run)
   GENERATE_DOCS=true
-  # No DOCS build when JDK_UPDATE_VERSION set
+  # No DOCS build when JDK_UPDATE_VERSION set on non-OPENJDK builds
   ifndef OPENJDK
     ifdef JDK_UPDATE_VERSION
       GENERATE_DOCS=false