projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a38d2a5)
whoops, remove conflict indicators!
authorElena Zannoni <ezannoni@kwikemart.cygnus.com>
Fri, 15 Dec 2000 20:56:42 +0000 (20:56 +0000)
committerElena Zannoni <ezannoni@kwikemart.cygnus.com>
Fri, 15 Dec 2000 20:56:42 +0000 (20:56 +0000)
gdb/ChangeLog patch | blob | history

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4724fb5b4066a2700a3c5077ed9213e5b3d2cfda..2c012d386a7373ab6ea645c490ebe375751e3f10 100644 (file)
--- 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