Cleanup merge botch.

This commit is contained in:
Andrew Cagney 2000-10-24 04:11:02 +00:00
parent 0d1176dd35
commit 7f1ef1da4a

View File

@ -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,