aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorTristan Gingold <gingold@adacore.com>2012-02-01 16:22:37 +0000
committerTristan Gingold <gingold@adacore.com>2012-02-01 16:22:37 +0000
commit72018481db836810ab1a76ad96ea2e6264cdd63d (patch)
treeb2d37318b5bd9109dbc32531cdadd442b2b0875f /gdb
parent47c1316cb5592dd623fe21ea098979f667c562a4 (diff)
downloadgdb-72018481db836810ab1a76ad96ea2e6264cdd63d.zip
gdb-72018481db836810ab1a76ad96ea2e6264cdd63d.tar.gz
gdb-72018481db836810ab1a76ad96ea2e6264cdd63d.tar.bz2
Remove spurious conflict indicators.
OVS: ----------------------------------------------------------------------
Diffstat (limited to 'gdb')
-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