changeset 306:5466f13d19be

Merge
author jqzuo
date Mon, 21 Feb 2011 14:18:37 -0500
parents 995077c73fbb (diff) e2370dfcc721 (current diff)
children 5d86d951426a
files
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Feb 14 14:29:10 2011 -0500
+++ b/.hgtags	Mon Feb 21 14:18:37 2011 -0500
@@ -103,3 +103,5 @@
 b566d490905691787f8931f69947a92c67c6d5e4 jdk7-b126
 bd70f76b0309068f157ae759c36eac8f2c6d098e jdk7-b127
 57d702105b23fb90e40beaf00f8f8aeae5e249e7 jdk7-b128
+a6b015b59fbc2518762c17ccc35702f03ef7713a jdk7-b129
+cc58c11af15411042719e9c82707fdbef60a9e0f jdk7-b130
--- a/README-builds.html	Mon Feb 14 14:29:10 2011 -0500
+++ b/README-builds.html	Mon Feb 21 14:18:37 2011 -0500
@@ -921,7 +921,7 @@
             <!-- ------------------------------------------------------ -->
             <h4><a name="ant">Ant</a></h4>
             <blockquote>
-                All OpenJDK builds require access to least Ant 1.6.5.
+                All OpenJDK builds require access to least Ant 1.7.1.
                 The Ant tool is available from the 
                 <a href="http://ant.apache.org" target="_blank">
                     Ant download site</a>.
--- a/make/Defs-internal.gmk	Mon Feb 14 14:29:10 2011 -0500
+++ b/make/Defs-internal.gmk	Mon Feb 21 14:18:37 2011 -0500
@@ -212,7 +212,7 @@
   SKIP_DEBUG_BUILD=true
 endif
 ifndef SKIP_FASTDEBUG_BUILD
-  SKIP_FASTDEBUG_BUILD=false
+  SKIP_FASTDEBUG_BUILD=true
 endif
 
 # Select javadoc setting GENERATE_DOCS