commit f456cd0b2d15e7c1e75639e7fc09743bf4ffab67
Merge: 38258a0 2b1f113
Author: Steve Traylen <steve.traylen@xxxxxxx>
Date: Mon Jan 10 20:44:20 2011 +0100
Merge branch 'master' into el5
Conflicts:
.gitignore
perl-Net-STOMP-Client.spec
sources
.gitignore | 2 +-
perl-Net-STOMP-Client.spec | 11 ++++++++++-
sources | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 39eb732,7d56a7b..6a01184
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--Net-STOMP-Client-0.9.2.tar.gz
+ /Net-STOMP-Client-0.9.5.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
