[ack/el4/master: 4/4] Merge branch 'master' into el4
Ian Burrell
iburrell at fedoraproject.org
Fri Apr 22 04:44:47 UTC 2011
commit 027c45249f6ecc17f981283e44255072ce8fca0f
Merge: dbd4b28 02cdaad
Author: Ian Burrell <ianburrell at gmail.com>
Date: Thu Apr 21 21:43:49 2011 -0700
Merge branch 'master' into el4
* master:
Remove README
Update to 1.94
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
Conflicts:
.gitignore
ack.spec
.gitignore | 2 +-
ack.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc ack.spec
index c2433a0,72562bb..36a194c
--- a/ack.spec
+++ b/ack.spec
@@@ -47,6 -47,15 +47,9 @@@ rm -rf $RPM_BUILD_ROO
%{_mandir}/man1/*
%changelog
+ * Thu Apr 21 2011 <ianburrell at gmail.com> - 1.94-1
+ - Update to 1.94
+
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.92-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Aug 4 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.92-2
-- rebuild with perl-5.12.1 again
-
* Wed Jun 16 2010 Ian Burrell <ianburrell at gmail.com> - 1.92-1
- Update to 1.92
More information about the scm-commits
mailing list