commit 6dcec5345e8789fb548e449ad1d05377677e354c Merge: a32694e 4531d0f Author: Paul Howarth <paul@xxxxxxxxxxxx> Date: Sun Jan 26 14:00:36 2014 +0000 Merge branch 'master' (early part) into el6 Conflicts: .gitignore .gitignore | 2 +- perl-File-chdir.spec | 68 +++++++++++++++++++++++++++++++++++++------------ sources | 2 +- 3 files changed, 53 insertions(+), 19 deletions(-) --- diff --cc .gitignore index 8e8f8b7,8f299ae..75a9c44 --- a/.gitignore +++ b/.gitignore @@@ -1,1 -1,5 +1,1 @@@ --File-chdir-0.09.tar.gz -/File-chdir-0.1003.tar.gz -/File-chdir-0.1006.tar.gz -/File-chdir-0.1007.tar.gz -/File-chdir-0.1008.tar.gz ++/File-chdir-[0-9.]*.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