commit 689b2172ec1b90d785b4cee8bfaa71e44863fe06 Merge: e13778f 887ac45 Author: Steve Traylen steve.traylen@cern.ch Date: Tue Aug 31 12:11:13 2010 +0200
Merge branch 'master' into el5
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
perl-devel@lists.fedoraproject.org