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

Remove CVS conflict markers from file

This commit is contained in:
Jim Kingdon 1994-05-12 18:13:17 +00:00
parent f55179cbcd
commit 291c622da4
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bfd/ChangeLog
View File

@ -135,7 +135,6 @@ Thu May 5 15:40:47 1994 Ken Raeburn (raeburn@cujo.cygnus.com)
(mips_fix_hi16_s): Use bfd_is_com_section.
(mips_howto_table_ext): Call mips_fix_jmp_addr for MIPS_RELOC_JMP.
>>>>>>> 1.1152
Wed May 4 11:09:53 1994 Ian Lance Taylor (ian@cygnus.com)
Changed m68k-aout to set flags to 0; m68k-sunos still uses 1.