projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2076c72)
Zap >>>>
authorAndrew Cagney <cagney@redhat.com>
Tue, 29 Jan 2002 21:37:15 +0000 (21:37 +0000)
committerAndrew Cagney <cagney@redhat.com>
Tue, 29 Jan 2002 21:37:15 +0000 (21:37 +0000)
gdb/ChangeLog patch | blob | history

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index de213873d97aafec32e19618900b8d4fea6a5bae..caf55ae99f61823984d2b8d8c98f91573bcd7150 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -50,7 +50,6 @@
        * config/ns32k/tm-umax.h (INVALID_FLOAT): Delete macro that was
        already commented out.
 
->>>>>>> 1.2087
 2002-01-26  Andreas Schwab  <schwab@suse.de>
 
        * config/m68k/nm-linux.h (FETCH_INFERIOR_REGISTERS): Define.