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

Resolve CVS conflict.

This commit is contained in:
Andreas Schwab 2001-12-10 12:33:42 +00:00
parent bc408b8a78
commit 11dc9c30bf
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gas/testsuite/ChangeLog
View File

@ -1,5 +1,4 @@
<<<<<<< ChangeLog
2001-11-26 Geoffrey Keating <geoffk@redhat.com>
2001-12-07 Geoffrey Keating <geoffk@redhat.com>
matthew green <mrg@redhat.com>
* gas/xstormy16/allinsn.d: New file.
@ -14,13 +13,11 @@
* gas/xstormy16/reloc-2.d: New file.
* gas/xstormy16/reloc-2.s: New file.
=======
2001-12-08 Alan Modra <amodra@bigpond.net.au>
* gas/all/incbin.s: Add spaces before directives.
* gas/all/incbin.d: Update.
>>>>>>> 1.255
Fri Dec 7 09:16:07 2001 Jeffrey A Law (law@cygnus.com)
* gas/hppa/parse/linesepbug.s: Restore to its original form,