commit 2d34089b230564f1fdee4ff252a5a1f9e0572fb9
Merge: a56f315 c4c7f17
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Thu Jul 5 14:57:03 2012 +0100
Merge branch 'master' into el6
Conflicts:
.gitignore
perl-YAML-LibYAML.spec
sources
.gitignore | 2 +-
YAML-LibYAML-0.35-format-error.patch | 39 +++++++++++
perl-YAML-LibYAML.spec | 116 +++++++++++++++++++++++++---------
sources | 2 +-
4 files changed, 128 insertions(+), 31 deletions(-)
---
diff --cc .gitignore
index 0c191af,e783894..9dac23c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,4 +1,1 @@@
- YAML-LibYAML-0.33.tar.gz
-/YAML-LibYAML-0.34.tar.gz
-/YAML-LibYAML-0.35.tar.gz
-/YAML-LibYAML-0.37.tar.gz
-/YAML-LibYAML-0.38.tar.gz
++/YAML-LibYAML-[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
