commit 0014377198f89c8544026912bc36bf77d7af111b
Merge: fd5371f d16efd6
Author: Jose Pedro Oliveira <jpo@xxxxxxxxxxxx>
Date: Sat Feb 8 20:42:59 2014 +0000
Merge branch 'master' into el6
Conflicts:
.gitignore
perl-pmtools.spec
sources
.gitignore | 6 ++++++
perl-pmtools.spec | 11 +++++++++++
sources | 4 ++++
3 files changed, 21 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 5e4994d,4e12420..e931f4b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,8 @@@
pmtools-1.10.tar.gz
++<<<<<<< HEAD
+/pmtools-1.54.tar.gz
++=======
+ /pmtools-1.30.tar.gz
+ /pmtools-1.54.tar.gz
+ /pmtools-2.0.0.tar.gz
++>>>>>>> master
diff --cc perl-pmtools.spec
index 995f925,7302bbb..b3cc5ab
--- a/perl-pmtools.spec
+++ b/perl-pmtools.spec
@@@ -1,6 -1,6 +1,11 @@@
Name: perl-pmtools
++<<<<<<< HEAD
+Version: 1.54
+Release: 2%{?dist}
++=======
+ Version: 2.0.0
+ Release: 1%{?dist}
++>>>>>>> master
Summary: A suite of small programs to help manage Perl modules
Group: Development/Libraries
@@@ -56,6 -56,9 +61,12 @@@ make tes
%changelog
++<<<<<<< HEAD
++=======
+ * Sat Feb 8 2014 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.0.0-1
+ - Update to 2.0.0.
+
++>>>>>>> master
* Wed Dec 11 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.54-2
- The test suite also needs the less command in the build root (F20+).
diff --cc sources
index bfb5b00,fb2d431..b6b18b8
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
+1a83a0209f3fde110f65647a9741c442 pmtools-1.54.tar.gz
++=======
+ a48ffb1abe14d2e05839fc6a48433665 pmtools-2.0.0.tar.gz
++>>>>>>> master
--
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
