diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2001-12-10 12:33:42 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2001-12-10 12:33:42 +0000 |
| commit | 11dc9c30bfe31918a30d95ac3fc46367c7106631 (patch) | |
| tree | 34c87e9a1ba6327d57580c3a8dc74cd46daeb505 /gas | |
| parent | bc408b8a7828191e93b12aa1b7131f8895bb516a (diff) | |
| download | gdb-11dc9c30bfe31918a30d95ac3fc46367c7106631.zip gdb-11dc9c30bfe31918a30d95ac3fc46367c7106631.tar.gz gdb-11dc9c30bfe31918a30d95ac3fc46367c7106631.tar.bz2 | |
Resolve CVS conflict.
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/testsuite/ChangeLog | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 61cee67..5b1baed 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -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, |