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

Remove ">>>>>>> 1.2917".

Browse Source
This commit is contained in:
H.J. Lu
2006-05-26 17:09:48 +00:00
parent 2043964ee2
commit a1c7b1260c
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gas/ChangeLog
View File

@ -53,7 +53,6 @@
missing -march options. Document .set arch=CPU. Move .set smartmips missing -march options. Document .set arch=CPU. Move .set smartmips
to ASE page. Use @code for .set FOO examples. to ASE page. Use @code for .set FOO examples.
>>>>>>> 1.2917
2006-05-23 Jie Zhang <jie.zhang@analog.com> 2006-05-23 Jie Zhang <jie.zhang@analog.com>
* config/tc-bfin.c (bfin_start_line_hook): Bump line counters * config/tc-bfin.c (bfin_start_line_hook): Bump line counters