diff options
| author | Neil Booth <neil@gcc.gnu.org> | 2001-07-10 05:54:40 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2001-07-10 05:54:40 +0000 |
| commit | 4c1643f818ced4e9ad62fcaa9bb37695d8ea76af (patch) | |
| tree | 7c3716a1af419dfd0708bf31ac19269b4b3749e1 | |
| parent | 2b1d9dc0efa7f724ce91c3463b1f5a70ab936cd1 (diff) | |
| download | gcc-4c1643f818ced4e9ad62fcaa9bb37695d8ea76af.zip gcc-4c1643f818ced4e9ad62fcaa9bb37695d8ea76af.tar.gz gcc-4c1643f818ced4e9ad62fcaa9bb37695d8ea76af.tar.bz2 | |
* ChangeLog: Resolve conflict.
From-SVN: r43887
| -rw-r--r-- | gcc/ChangeLog | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f1379c1..abf5bd4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -307,13 +307,8 @@ Mon Jul 9 06:41:07 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu> Delete. * config/m88k/m88k.c (m88k_end_prologue, m88k_begin_epilogue): Rename an use in target struct, make static. -<<<<<<< ChangeLog - * ia64/ia64.h (FUNCTION_END_PROLOGUE, FUNCTION_BEGIN_EPILOGUE): Delete. -======= * config/ia64/ia64.h (FUNCTION_END_PROLOGUE, FUNCTION_BEGIN_EPILOGUE): Delete. ->>>>>>> 1.10591 - 2001-07-08 Richard Henderson <rth@redhat.com> |