diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 2008-09-29 17:36:25 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 2008-09-29 17:36:25 +0000 |
commit | 00dd722c5378e478eed4daa17120ab518ad2f0b8 (patch) | |
tree | daf0e090e9719c0407f3a6b208b46b6cc2645a55 /gnu/usr.bin/perl/perlsfio.h | |
parent | bfa863c83bfd01d72a748decaaf2676b800c60ff (diff) |
fix conflicts and merge in local changes to perl 5.10.0
Diffstat (limited to 'gnu/usr.bin/perl/perlsfio.h')
-rw-r--r-- | gnu/usr.bin/perl/perlsfio.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/usr.bin/perl/perlsfio.h b/gnu/usr.bin/perl/perlsfio.h index 3d279d0c8ac..d4b097f3a9f 100644 --- a/gnu/usr.bin/perl/perlsfio.h +++ b/gnu/usr.bin/perl/perlsfio.h @@ -1,6 +1,7 @@ /* perlsfio.h * - * Copyright (C) 1996, 1999, 2000, 2001, 2002, by Larry Wall and others + * Copyright (C) 1996, 1999, 2000, 2001, 2002, 2003, 2005, 2007, + * by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. |