Merge branch 'master' into f13

2010-10-03 12:36:05 -04:00 · 2010-10-03 12:36:05 -04:00 · 51af3f2bb8
commit 51af3f2bb8
parent d458fd6427 e558705fdf
3 changed files with 7 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,3 +2,4 @@ mercurial-1.6.tar.gz
 mercurial-1.6.2.tar.gz
 *~
 /mercurial-1.6.3.tar.gz
+/mercurial-1.6.4.tar.gz
--- a/mercurial.spec
+++ b/mercurial.spec
@ -2,8 +2,8 @@

 Summary: Mercurial -- a distributed SCM
 Name: mercurial
-Version: 1.6.3
-Release: 2%{?dist}
+Version: 1.6.4
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@ -166,6 +166,9 @@ rm -rf $RPM_BUILD_ROOT
 ##cd tests && %{__python} run-tests.py

 %changelog
+* Fri Oct  1 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.4-1
+- Update to 1.6.4
+
 * Fri Aug 27 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.3-1
 - Fix some rpmlint issues

--- a/2
+++ b/2
@ -1 +1 @@
-fcd61edc488d1b9aa831dde6f14d9a13  mercurial-1.6.3.tar.gz
+657dd6aff80aa9a3b187652a635544d0  mercurial-1.6.4.tar.gz