aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index de21387..caf55ae 100644
--- 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.