espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-20 09:58:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove spurious conflict indicators.

Browse Source 
OVS: ----------------------------------------------------------------------
This commit is contained in:
Tristan Gingold
2012-02-01 16:22:37 +00:00
parent 47c1316cb5
commit 72018481db
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gdb/ChangeLog
View File

@ -591,7 +591,6 @@
* target.c (unpush_target): Close target after unpushing it, not * target.c (unpush_target): Close target after unpushing it, not
before. before.
>>>>>>> 1.13788
2012-01-19 Gary Benson <gbenson@redhat.com> 2012-01-19 Gary Benson <gbenson@redhat.com>
* mdebugread.c (sort_blocks): Replace integer constants with ones * mdebugread.c (sort_blocks): Replace integer constants with ones
@ -632,7 +631,6 @@
record breakpoints list. Only remove breakpoints from the record breakpoints list. Only remove breakpoints from the
inferior if they had been inserted there in the first place. inferior if they had been inserted there in the first place.
>>>>>>> 1.13749
2012-01-17 Doug Evans <dje@google.com> 2012-01-17 Doug Evans <dje@google.com>
* linespec.c (decode_line_internal): Don't call symtabs_from_filename * linespec.c (decode_line_internal): Don't call symtabs_from_filename