diff options
| author | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-07-10 05:54:40 +0000 |
|---|---|---|
| committer | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-07-10 05:54:40 +0000 |
| commit | a4b57ca1209c39ec7d6d544b05530730f6e2cce0 (patch) | |
| tree | 7c3716a1af419dfd0708bf31ac19269b4b3749e1 | |
| parent | fac55a463ca2820bf9d76ba70b9dc1b75aff6fe0 (diff) | |
| download | ppe42-gcc-a4b57ca1209c39ec7d6d544b05530730f6e2cce0.tar.gz ppe42-gcc-a4b57ca1209c39ec7d6d544b05530730f6e2cce0.zip | |
* ChangeLog: Resolve conflict.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@43887 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f1379c1a876..abf5bd46397 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> |
