[perl-IO-AIO: 7/9] Merge branch 'master' into f13
Paul Howarth
pghmcfc at fedoraproject.org
Thu Mar 10 14:50:51 UTC 2011
commit b89e59edc57de94ef328f9403d3f0676d109d750
Merge: 1f45a88 4c69abb
Author: Paul Howarth <paul at city-fan.org>
Date: Thu Mar 10 14:25:43 2011 +0000
Merge branch 'master' into f13
Conflicts:
.gitignore
.gitignore | 2 +-
perl-IO-AIO.spec | 57 ++++++++++++++++++++++++++++++++++++++---------------
sources | 2 +-
3 files changed, 43 insertions(+), 18 deletions(-)
---
diff --cc .gitignore
index 76e860d,f945f0b..5532fae
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,1 @@@
- IO-AIO-3.17.tar.gz
-/IO-AIO-3.17.tar.gz
++/IO-AIO-3.71.tar.gz
More information about the scm-commits
mailing list