projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2b1d9dc)
* ChangeLog: Resolve conflict.
authorNeil Booth <neil@gcc.gnu.org>
Tue, 10 Jul 2001 05:54:40 +0000 (05:54 +0000)
committerNeil Booth <neil@gcc.gnu.org>
Tue, 10 Jul 2001 05:54:40 +0000 (05:54 +0000)
From-SVN: r43887

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f1379c1a876bb633f9e7d4096d1b633b491ed587..abf5bd463976bf117d016ffd022c80646cd601fa 100644 (file)
--- 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>