diff options
| author | Elena Zannoni <ezannoni@kwikemart.cygnus.com> | 2000-12-15 20:56:42 +0000 |
|---|---|---|
| committer | Elena Zannoni <ezannoni@kwikemart.cygnus.com> | 2000-12-15 20:56:42 +0000 |
| commit | c898ebff4c7a2cb3d5375a8c600268477ec4db60 (patch) | |
| tree | 6408fe08ac101b2e0408f8314ae02d70ff371c09 | |
| parent | a38d2a54bea9fc3080e12cf0381c8ae32684a8e3 (diff) | |
| download | gdb-c898ebff4c7a2cb3d5375a8c600268477ec4db60.zip gdb-c898ebff4c7a2cb3d5375a8c600268477ec4db60.tar.gz gdb-c898ebff4c7a2cb3d5375a8c600268477ec4db60.tar.bz2 | |
whoops, remove conflict indicators!
| -rw-r--r-- | gdb/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4724fb5..2c012d3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -152,7 +152,6 @@ Fri Dec 15 22:58:59 2000 Andrew Cagney <cagney@b1.cygnus.com> * configure.tgt (m68*-*-netbsd*, ns32k-*-netbsd*): Add gdbserver to configdirs. ->>>>>>> 1.847 2000-12-07 Elena Zannoni <ezannoni@kwikemart.cygnus.com> * config/sh/tm-sh.h (struct gdbarch_tdep): Rename fields |