diff options
| author | markm <markm@FreeBSD.org> | 2002-03-16 22:15:33 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2002-03-16 22:15:33 +0000 |
| commit | 126590329a93f84243bce209bfa7766c61768af6 (patch) | |
| tree | ba753978b20c73221c0d9296512aa7cbf74a8af4 /contrib | |
| parent | 12e9436f28258a92b0aab5897da534913d45ba54 (diff) | |
| download | FreeBSD-src-126590329a93f84243bce209bfa7766c61768af6.zip FreeBSD-src-126590329a93f84243bce209bfa7766c61768af6.tar.gz | |
Update conflict merge for 5.6.1. This is a rotten hack, but it
works for all FreeBSD purposes.
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/perl5/configpm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/perl5/configpm b/contrib/perl5/configpm index cd117f2..656e379 100755 --- a/contrib/perl5/configpm +++ b/contrib/perl5/configpm @@ -18,7 +18,7 @@ my $glossary = $ARGV[1] || 'Porting/Glossary'; open CONFIG, ">$config_pm" or die "Can't open $config_pm: $!\n"; -$myver = "v5.6.0"; # XXX - Yuck - allow bootstrapping. MarkM +$myver = "v5.6.1"; # XXX - Yuck - allow bootstrapping. MarkM print CONFIG <<'ENDOFBEG_NOQ', <<"ENDOFBEG"; package Config; |
