Merge branch 'master' into f13

This commit is contained in:
Neal Becker 2010-08-26 14:41:51 -04:00
commit 4d41794a5c
3 changed files with 6 additions and 2 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
mercurial-1.6.tar.gz mercurial-1.6.tar.gz
mercurial-1.6.2.tar.gz mercurial-1.6.2.tar.gz
*~ *~
/mercurial-1.6.3.tar.gz

View File

@ -2,7 +2,7 @@
Summary: A fast, lightweight distributed source control management system Summary: A fast, lightweight distributed source control management system
Name: mercurial Name: mercurial
Version: 1.6.2 Version: 1.6.3
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: Development/Tools Group: Development/Tools
@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT
##cd tests && %{__python} run-tests.py ##cd tests && %{__python} run-tests.py
%changelog %changelog
* Thu Aug 26 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.3-1
- Update to 1.6.3
* Mon Aug 2 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.2-1 * Mon Aug 2 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.2-1
- Update to 1.6.2 - Update to 1.6.2

View File

@ -1 +1 @@
847359d7488caf8074a69d4b87ca64d2 mercurial-1.6.2.tar.gz fcd61edc488d1b9aa831dde6f14d9a13 mercurial-1.6.3.tar.gz