aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog2
1 files changed, 0 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index de161de..b53d1b7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -591,7 +591,6 @@
* target.c (unpush_target): Close target after unpushing it, not
before.
->>>>>>> 1.13788
2012-01-19 Gary Benson <gbenson@redhat.com>
* mdebugread.c (sort_blocks): Replace integer constants with ones
@@ -632,7 +631,6 @@
record breakpoints list. Only remove breakpoints from the
inferior if they had been inserted there in the first place.
->>>>>>> 1.13749
2012-01-17 Doug Evans <dje@google.com>
* linespec.c (decode_line_internal): Don't call symtabs_from_filename