Merged changes from release branch back to trunk.

joe.walnes · joe.walnes · commit d7df225f1370 · 2007-06-30T13:33:45.000Z
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,4 +1,6 @@
-== Version 1.1: In Development ==
+== Version 1.2: In Development ==
+
+== Version 1.1: Released Jun 30 2007 ==
 
 * Hamcrest Generator now includes JavaDoc and parameter names in generated code
   by using QDox to parse the source code.
diff --git a/build.xml b/build.xml
@@ -179,7 +179,7 @@
                 <include name="lib/**"/>
                 <include name="*.txt"/>
                 <include name="build.xml"/>
-                <include name="matchers.xml"/>
+                <include name="*matchers.xml"/>
             </zipfileset>
             <zipfileset dir="build" prefix="hamcrest-${version}">
                 <include name="hamcrest-core-${version}.jar"/>
@@ -195,7 +195,7 @@
                 <include name="lib/**"/>
                 <include name="*.txt"/>
                 <include name="build.xml"/>
-                <include name="matchers.xml"/>
+                <include name="*matchers.xml"/>
             </tarfileset>
             <tarfileset dir="build" prefix="hamcrest-${version}">
                 <include name="hamcrest-core-${version}.jar"/>
@@ -260,4 +260,4 @@
         </sequential>
     </macrodef>
 
-</project>
+</project>
