mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-09 13:17:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove conflict marker

Browse Source 
From-SVN: r32096
This commit is contained in:
Martin v. Löwis 2000-02-22 00:04:20 +00:00
parent 2a1ed9c111
commit 7d612b1e4a
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gcc/ChangeLog
View File

@ -145,7 +145,6 @@ Fri Feb 18 20:08:57 2000 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
* config/alpha/alpha.h (INITIAL_ELIMINATION_OFFSET): Add abort * config/alpha/alpha.h (INITIAL_ELIMINATION_OFFSET): Add abort
in unhandled case. in unhandled case.
>>>>>>> 1.5739
2000-02-18 Nick Clifton <nickc@cygnus.com> 2000-02-18 Nick Clifton <nickc@cygnus.com>
* config/arm/elf.h (ASM_OUTPUT_ALIGN): Do not generate * config/arm/elf.h (ASM_OUTPUT_ALIGN): Do not generate