From 2e5cf746c5586791b11faa8aaf57314027e7dd0b Mon Sep 17 00:00:00 2001
From: Bill Lynch <billjive@gmail.com>
Date: Fri, 24 Jan 2003 03:30:37 +0000
Subject: [PATCH] Merge dir now in release

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@1824 b35dd754-fafc-0310-a699-88a17e54d16e
---
 build/release.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/release.xml b/build/release.xml
index 071dbc4c6..8ec4fc808 100644
--- a/build/release.xml
+++ b/build/release.xml
@@ -27,7 +27,7 @@
         <mkdir dir="${release.dir}" />
         <!-- Copy smack.jar -->
         <copy todir="${release.dir}">
-            <fileset dir="${jar.dest.dir}" includes="smack.jar" /> 
+            <fileset dir="${jar.dest.dir}" includes="smack.jar" />
         </copy>
         <!-- Copy build dir -->
         <copy todir="${release.dir}/build">
@@ -36,6 +36,7 @@
                 <include name="build.xml" />
                 <include name="README.html" />
                 <include name="lib/*.jar" />
+                <include name="merge/*.jar" />
             </fileset>
         </copy>
         <!-- Copy Javadocs -->