diff options
| author | Andrew Cagney <cagney@redhat.com> | 2000-10-24 04:11:02 +0000 |
|---|---|---|
| committer | Andrew Cagney <cagney@redhat.com> | 2000-10-24 04:11:02 +0000 |
| commit | 7f1ef1da4a30bacdeadcd295a7187cd34da818ed (patch) | |
| tree | f553a2321414bd38e3a124ce5c03de49dd29f00b /gdb | |
| parent | 0d1176dd35bf154abe93f1a33a0e122f4e526534 (diff) | |
| download | gdb-7f1ef1da4a30bacdeadcd295a7187cd34da818ed.zip gdb-7f1ef1da4a30bacdeadcd295a7187cd34da818ed.tar.gz gdb-7f1ef1da4a30bacdeadcd295a7187cd34da818ed.tar.bz2 | |
Cleanup merge botch.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ab50cd1..f2bd13a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -40,7 +40,6 @@ Fri Oct 20 19:08:47 2000 Andrew Cagney <cagney@b1.cygnus.com> * remote-utils.c (gr_multi_scan): Protoize. * remote-vx.c (vx_xfer_memory, net_get_symbols): Protoize. ->>>>>>> 1.717 2000-10-13 Fernando Nasser <fnasser@cygnus.com> * remote.c (putpkt_binary): Call read_frame, not getpkt. Log message. @@ -133,7 +132,6 @@ Fri Oct 20 19:08:47 2000 Andrew Cagney <cagney@b1.cygnus.com> * rs6000-tdep.c (skip_prologue): Add new parameter lim_pc. Update all callers. ->>>>>>> 1.709 2000-10-03 Kevin Buettner <kevinb@redhat.com> * remote-bug.c (bug_xfer_memory, bug_insert_breakpoint, |