commit 3aeebd4a043cf4eb182fafbfde4e117c8e55d598
Merge: 48e7999 abde086
Author: Marcela Mašláňová <mmasl...@redhat.com>
Date:   Mon Nov 8 09:44:14 2010 +0100

    Merge branch 'master' into el6
    
    Conflicts:
        .gitignore

 .gitignore             |    1 +
 perl-Log-Log4perl.spec |   29 ++++++++++++++++++++++++-----
 sources                |    2 +-
 3 files changed, 26 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 2339e9c,e84ea49..89cc1f8
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,2 @@@
  Log-Log4perl-1.24.tar.gz
 -/Log-Log4perl-1.30.tar.gz
++Log-Log4perl-1.30.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/perl-devel

Reply via email to