Merge
This commit is contained in:
commit
6f721f2983
@ -102,3 +102,4 @@ ed6950da30cf1e8904b4bdb034d471647942271f jdk7-b123
|
|||||||
5c4df7e992775c102f08e9f1c0a124b324641b70 jdk7-b125
|
5c4df7e992775c102f08e9f1c0a124b324641b70 jdk7-b125
|
||||||
b566d490905691787f8931f69947a92c67c6d5e4 jdk7-b126
|
b566d490905691787f8931f69947a92c67c6d5e4 jdk7-b126
|
||||||
bd70f76b0309068f157ae759c36eac8f2c6d098e jdk7-b127
|
bd70f76b0309068f157ae759c36eac8f2c6d098e jdk7-b127
|
||||||
|
57d702105b23fb90e40beaf00f8f8aeae5e249e7 jdk7-b128
|
||||||
|
@ -921,7 +921,7 @@
|
|||||||
<!-- ------------------------------------------------------ -->
|
<!-- ------------------------------------------------------ -->
|
||||||
<h4><a name="ant">Ant</a></h4>
|
<h4><a name="ant">Ant</a></h4>
|
||||||
<blockquote>
|
<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
|
The Ant tool is available from the
|
||||||
<a href="http://ant.apache.org" target="_blank">
|
<a href="http://ant.apache.org" target="_blank">
|
||||||
Ant download site</a>.
|
Ant download site</a>.
|
||||||
|
@ -212,7 +212,7 @@ ifndef SKIP_DEBUG_BUILD
|
|||||||
SKIP_DEBUG_BUILD=true
|
SKIP_DEBUG_BUILD=true
|
||||||
endif
|
endif
|
||||||
ifndef SKIP_FASTDEBUG_BUILD
|
ifndef SKIP_FASTDEBUG_BUILD
|
||||||
SKIP_FASTDEBUG_BUILD=false
|
SKIP_FASTDEBUG_BUILD=true
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Select javadoc setting GENERATE_DOCS
|
# Select javadoc setting GENERATE_DOCS
|
||||||
|
Loading…
x
Reference in New Issue
Block a user