[perl-Directory-Queue/el4/master: 7/7] Merge branch 'master' into el4
stevetraylen
stevetraylen at fedoraproject.org
Tue Aug 31 08:13:42 UTC 2010
commit 058fc48a4d4a25311c81a68ccda95134df764ea3
Merge: 1eef375 887ac45
Author: Steve Traylen <steve.traylen at cern.ch>
Date: Tue Aug 31 12:13:22 2010 +0200
Merge branch 'master' into el4
Conflicts:
.gitignore
perl-Directory-Queue.spec
sources
.gitignore | 2 +-
perl-Directory-Queue.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 598cf28,fa03236..de58323
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--Directory-Queue-0.5.tar.gz
+ /Directory-Queue-1.0.tar.gz
More information about the scm-commits
mailing list