[perl-Mail-SPF/f13/master: 4/4] Merge branch 'master' into f13

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



commit e221c83dacdaece7c7eea174b710a59ad53feed9
Merge: 674ba1c fbb700d
Author: Nick Bebout <nb@xxxxxxxxxxxxxxxxx>
Date:   Sun Dec 5 21:28:25 2010 -0600

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore         |    2 +-
 perl-Mail-SPF.spec |   10 ++++++++--
 sources            |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 18c73fe,e100478..6bdd2b4
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,1 @@@
- Mail-SPF-v2.006.tar.gz
 -/Mail-SPF-v2.007.tar.gz
++Mail-SPF-v2.007.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel


[Index of Archives]     [Fedora Announce]     [Fedora Kernel]     [Fedora Testing]     [Fedora Legacy Announce]     [Fedora PHP Devel]     [Kernel Devel]     [Fedora Legacy]     [Fedora Maintainers]     [Fedora Desktop]     [PAM]     [Red Hat Development]     [Big List of Linux Books]     [Gimp]     [Yosemite Information]
  Powered by Linux