OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove left-over CVS conflict marker 

From-SVN: r28661
This commit is contained in:
Jeff Law 1999-08-11 01:25:49 -06:00
parent 7aed7b7099
commit c4e897c16e
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

@ -429,7 +429,6 @@ Mon Aug 9 01:52:24 1999 Jason Merrill <jason@yorick.cygnus.com>
* except.c (expand_eh_region_start_for_decl): Always start a new block. * except.c (expand_eh_region_start_for_decl): Always start a new block.
* stmt.c (is_eh_region): Make sure current_function is present, too. * stmt.c (is_eh_region): Make sure current_function is present, too.
>>>>>>> 1.4094
Mon Aug 9 01:15:24 1999 Jeffrey A Law (law@cygnus.com) Mon Aug 9 01:15:24 1999 Jeffrey A Law (law@cygnus.com)
* pa.h (HARD_REGNO_MODE_OK): Correctly handle FPregs, even when * pa.h (HARD_REGNO_MODE_OK): Correctly handle FPregs, even when