OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove conflict indicators.

This commit is contained in:
Jeff Johnston 2004-02-23 19:26:45 +00:00
parent cbdeadcaa3
commit 3457d66e5b
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdb/ChangeLog
View File

@ -309,7 +309,6 @@
* sh-tdep.c (sh_analyze_prologue): Eliminate useless test of
cache->uses_fp prior to setting it.
>>>>>>> 1.5450
2004-02-19 Fred Fish <fnf@redhat.com>
Fix for PR breakpoint/1558.
@ -326,7 +325,6 @@
type being greater than sizeof of host's LONGEST. Always use
unpack_long() unless format 'f' chosen.
>>>>>>> 1.5419
2004-02-19 Joel Brobecker <brobecker@gnat.com>
Committed by Elena Zannoni <ezannoni@redhat.com>