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/gas/output-file.c | |
| parent | 99d2ba46f95f9f99286b4c66576c4607669b0e7f (diff) | |
resolve conflicts.
Diffstat (limited to 'gnu/usr.bin/binutils/gas/output-file.c')
| -rw-r--r-- | gnu/usr.bin/binutils/gas/output-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/usr.bin/binutils/gas/output-file.c b/gnu/usr.bin/binutils/gas/output-file.c index a7df72f2937..bcd49b51012 100644 --- a/gnu/usr.bin/binutils/gas/output-file.c +++ b/gnu/usr.bin/binutils/gas/output-file.c @@ -1,5 +1,5 @@ /* output-file.c - Deal with the output file - Copyright (C) 1987, 90, 91, 93, 92, 94, 95, 96, 1998 + Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1996, 1998, 1999 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. |