From c54e268ac6c24035fa4a9d623a4eaef4d5ecaf51 Mon Sep 17 00:00:00 2001
From: Conor MacNeill <conor@apache.org>
Date: Fri, 2 Mar 2001 23:08:28 +0000
Subject: [PATCH] Further merges now that CVS is going a little faster

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268749 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW  | 5 ++++-
 build.xml | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/WHATSNEW b/WHATSNEW
index 7dab24184..a2c23ec4b 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,4 +1,4 @@
-Changes from Ant 1.2 to Ant 1.3 Beta 2
+Changes from Ant 1.2 to Ant 1.3 Beta 3
 ===========================================
 
 Changes that could break older environments:
@@ -84,6 +84,9 @@ Fixed bugs:
 
 * javadoc's failonerror attribute works again
 
+* javadoc's additionalparam attribute will now be split into separate
+  parameters (on spaces) to allow for more than one parameter.
+
 * Changed <sql> task so that printing result sets works on Oracle
 
 * Changes to ddcreator and ejbc helper to respect the descriptor hierarchy
diff --git a/build.xml b/build.xml
index fbf0c4ce9..6142272d4 100644
--- a/build.xml
+++ b/build.xml
@@ -605,6 +605,7 @@
     <delete dir="${tests.etc.dir}/taskdefs/taskdefs.tmp" />
     <delete dir="${tests.etc.dir}/taskdefs.tmp" />
     <delete file="${tests.etc.dir}/taskdefs/tmp.jar" />
+    <delete dir="${tests.etc.dir}/types/copytest" />
   </target>
 
   <target name="run-single-test" if="testcase" depends="compile-tests">