[perl-File-chdir/el6: 16/16] Merge branch 'master' (early part) into el6
Paul Howarth
pghmcfc at fedoraproject.org
Sun Jan 26 14:01:48 UTC 2014
commit 6dcec5345e8789fb548e449ad1d05377677e354c
Merge: a32694e 4531d0f
Author: Paul Howarth <paul at city-fan.org>
Date: Sun Jan 26 14:00:36 2014 +0000
Merge branch 'master' (early part) into el6
Conflicts:
.gitignore
.gitignore | 2 +-
perl-File-chdir.spec | 68 +++++++++++++++++++++++++++++++++++++------------
sources | 2 +-
3 files changed, 53 insertions(+), 19 deletions(-)
---
diff --cc .gitignore
index 8e8f8b7,8f299ae..75a9c44
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,5 +1,1 @@@
--File-chdir-0.09.tar.gz
-/File-chdir-0.1003.tar.gz
-/File-chdir-0.1006.tar.gz
-/File-chdir-0.1007.tar.gz
-/File-chdir-0.1008.tar.gz
++/File-chdir-[0-9.]*.tar.gz
More information about the scm-commits
mailing list