projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f165689)
*** empty log message ***
authorJim Blandy <jimb@codesourcery.com>
Mon, 3 Apr 2000 17:50:12 +0000 (17:50 +0000)
committerJim Blandy <jimb@codesourcery.com>
Mon, 3 Apr 2000 17:50:12 +0000 (17:50 +0000)
gdb/ChangeLog patch | blob | history

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6f5e720920f9d2692338644f57f3082549abd181..66574799c0577edfda0f9476bb5c1ed2f033495b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -163,7 +163,6 @@ Thu Mar 30 12:09:50 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
        * configure.in: -linux-gnu*, not -linux-gnu.
 
->>>>>>> 1.227
 Tue Mar 28 18:28:40 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
        * remote.c (remote_threads_extra_info): Replace qfThreadExtraInfo