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

Remove ">>>>>>> 1.3701".

This commit is contained in:
H.J. Lu 2007-01-03 20:23:28 +00:00
parent d5d6fca504
commit 1dbafe8ead
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

@ -121,7 +121,6 @@
* elf64-alpha.c (elf64_alpha_merge_symbol_attribute): New function.
(elf_backend_merge_symbol_attribute): Define.
>>>>>>> 1.3701
2006-12-04 Jan Beulich <jbeulich@novell.com>
* elflink.c (_bfd_elf_link_create_dynamic_sections): Don't create