projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0d1176d)
Cleanup merge botch.
authorAndrew Cagney <cagney@redhat.com>
Tue, 24 Oct 2000 04:11:02 +0000 (04:11 +0000)
committerAndrew Cagney <cagney@redhat.com>
Tue, 24 Oct 2000 04:11:02 +0000 (04:11 +0000)
gdb/ChangeLog patch | blob | history

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ab50cd17aa5cb2f639e9657f1e59c62549ccc57c..f2bd13a22518e651d4e4f29ac14f8425130eceec 100644 (file)
--- 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,