diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2002-05-13 17:07:46 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2002-05-13 17:07:46 +0000 |
| commit | c866442bb5e16be2b5323fee961ceb1315393514 (patch) | |
| tree | f12f495081042abe1a40d83bf05d076ff8aa8a17 /gnu/usr.bin/binutils/ld/mri.h | |
| parent | 99d2ba46f95f9f99286b4c66576c4607669b0e7f (diff) | |
resolve conflicts.
Diffstat (limited to 'gnu/usr.bin/binutils/ld/mri.h')
| -rw-r--r-- | gnu/usr.bin/binutils/ld/mri.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/usr.bin/binutils/ld/mri.h b/gnu/usr.bin/binutils/ld/mri.h index dc3f0f3a190..e857e3d738c 100644 --- a/gnu/usr.bin/binutils/ld/mri.h +++ b/gnu/usr.bin/binutils/ld/mri.h @@ -1,5 +1,5 @@ /* mri.h -- header file for MRI scripting functions - Copyright 1993, 95, 1996 Free Software Foundation, Inc. + Copyright 1993, 1995, 1996 Free Software Foundation, Inc. This file is part of GLD, the Gnu Linker. |