summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/binutils/opcodes/i960-dis.c
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2002-05-13 17:07:46 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2002-05-13 17:07:46 +0000
commitc866442bb5e16be2b5323fee961ceb1315393514 (patch)
treef12f495081042abe1a40d83bf05d076ff8aa8a17 /gnu/usr.bin/binutils/opcodes/i960-dis.c
parent99d2ba46f95f9f99286b4c66576c4607669b0e7f (diff)
resolve conflicts.
Diffstat (limited to 'gnu/usr.bin/binutils/opcodes/i960-dis.c')
-rw-r--r--gnu/usr.bin/binutils/opcodes/i960-dis.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/usr.bin/binutils/opcodes/i960-dis.c b/gnu/usr.bin/binutils/opcodes/i960-dis.c
index 79820850b4f..90b170a3bb8 100644
--- a/gnu/usr.bin/binutils/opcodes/i960-dis.c
+++ b/gnu/usr.bin/binutils/opcodes/i960-dis.c
@@ -1,5 +1,6 @@
/* Disassemble i80960 instructions.
- Copyright (C) 1990, 91, 93, 94, 95, 96, 1998 Free Software Foundation, Inc.
+ Copyright 1990, 1991, 1993, 1994, 1995, 1996, 1998, 1999, 2000
+ Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by