diff options
| author | Jim Kingdon <jkingdon@engr.sgi.com> | 1994-05-12 18:13:17 +0000 |
|---|---|---|
| committer | Jim Kingdon <jkingdon@engr.sgi.com> | 1994-05-12 18:13:17 +0000 |
| commit | 291c622da4849dba360a6dbb45401f3c2eaacaa1 (patch) | |
| tree | f82475ebc85982d1ecf39c0b9e7f85ad91540dbf /bfd | |
| parent | f55179cbcda1f767ecb7678e581f738a7d35acb5 (diff) | |
| download | gdb-291c622da4849dba360a6dbb45401f3c2eaacaa1.zip gdb-291c622da4849dba360a6dbb45401f3c2eaacaa1.tar.gz gdb-291c622da4849dba360a6dbb45401f3c2eaacaa1.tar.bz2 | |
Remove CVS conflict markers from file
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 43eed1f..cd1fc3c 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -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. |