Merge branch 'master' into f13

2011-04-02 14:04:38 -04:00 · 2011-04-02 14:04:38 -04:00 · 806d995c41
commit 806d995c41
parent ce7a3d7c9a 4b1339e815
3 changed files with 7 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -10,3 +10,4 @@ mercurial-1.6.2.tar.gz
 /mercurial-1.7.5.tar.gz
 /mercurial-1.8.tar.gz
 /mercurial-1.8.1.tar.gz
+/mercurial-1.8.2.tar.gz
--- a/mercurial.spec
+++ b/mercurial.spec
@ -2,8 +2,8 @@

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

 %changelog
+* Sat Apr  2 2011 Neal Becker <ndbecker2@gmail.com> - 1.8.2-1
+- update to 1.8.2
+
 * Mon Mar 14 2011 Neal Becker <ndbecker2@gmail.com> - 1.8.1-2
 - Try BR emacs-nox

--- a/2
+++ b/2
@ -1 +1 @@
-e0a8cfca69aa4003ea3187aed609d5e0  mercurial-1.8.1.tar.gz
+a1634b9b709ecc70662f3257abece2c7  mercurial-1.8.2.tar.gz