riscv
/
binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

cr-0x5f1
H.J. Lu 21 years ago
parent
2043964ee2
commit
a1c7b1260c
1 changed files with 0 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      gas/ChangeLog

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

Write Preview
Loading…
Cancel
Save