From 75be43a0db87407b5342e80fb809b42f618a4c4b Mon Sep 17 00:00:00 2001
From: Matthew Jason Benson <mbenson@apache.org>
Date: Wed, 23 Jun 2004 19:41:27 +0000
Subject: [PATCH] Show latest merges

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276621 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 258886b37..414441ada 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -16,23 +16,11 @@ Other changes:
 * Enable to choose the regexp implementation without system property.
   Bugzilla Report 15390.
 
-* Nested file mappers and a container mapper implementation have been
-  introduced.  Additionally, the <mapper> element now accepts "defined"
-  nested FileNameMapper implementations directly, allowing a usage
-  comparable to those of <condition>, <filter>, and <selector>.
-
-* New <redirector> type introduced to provide extreme I/O flexibility.
-  Initial support for <exec>, <apply>, and <java> tasks.
-
 * Changed default tempdir for <javac> from user.dir to java.io.tmpdir.
 
 * A new base class DispatchTask has been added to facilitate elegant 
   creation of tasks with multiple actions.
 
-* <apply> has a new ignoremissing attribute (default true for BC)
-  which will allow nonexistent files specified via <filelist>s to
-  be passed to the executable.  Bugzilla Report 29585.
-
 Changes from Ant 1.6.1 to current Ant 1.6 CVS version
 =====================================================
 
@@ -241,6 +229,18 @@ Other changes:
 * <loadproperties> supports loading from a resource.
   Bugzilla Report 28340.
 
+* Nested file mappers and a container mapper implementation have been
+  introduced.  Additionally, the <mapper> element now accepts "defined"
+  nested FileNameMapper implementations directly, allowing a usage
+  comparable to those of <condition>, <filter>, and <selector>.
+
+* New <redirector> type introduced to provide extreme I/O flexibility.
+  Initial support for <exec>, <apply>, and <java> tasks.
+
+* <apply> has a new ignoremissing attribute (default true for BC)
+  which will allow nonexistent files specified via <filelist>s to
+  be passed to the executable.  Bugzilla Report 29585.
+
 Changes from Ant 1.6.0 to Ant 1.6.1
 =============================================