Resolve CVS conflict.
commitc22233f3f35dd66e4d0dfa9a1602d485ac717b35
authorAndreas Schwab <schwab@linux-m68k.org>
Mon, 10 Dec 2001 12:33:42 +0000 (10 12:33 +0000)
committerAndreas Schwab <schwab@linux-m68k.org>
Mon, 10 Dec 2001 12:33:42 +0000 (10 12:33 +0000)
treefbd46d132fd7d1973f156016e9a1df71f11e941c
parentbd586261169549936444e4b09a7daa85ce1693f5
Resolve CVS conflict.
gas/testsuite/ChangeLog