projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2cb921f)
fix conflicts
authorAldy Hernandez <aldyh@gcc.gnu.org>
Thu, 21 Mar 2002 23:16:17 +0000 (23:16 +0000)
committerAldy Hernandez <aldyh@gcc.gnu.org>
Thu, 21 Mar 2002 23:16:17 +0000 (23:16 +0000)
From-SVN: r51147

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 67d1cd5992458439585ff5898fc22584f63caaac..f70bed8a3010ebed67dd0c7c5d97b3cd5a749700 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -376,7 +376,6 @@ Tue Mar 19 14:12:32 2002  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
        (movqi): Use gen_lowpart in place of gen_rtx_SUBREG.
        Replace gen_rtx (SUBREG) with gen_rtx_SUBREG.
 
->>>>>>> 1.13452
 2002-03-18  Aldy Hernandez  <aldyh@redhat.com>
 
        * config/rs6000/rs6000.h (PREDICATE_CODES): Add PARALLEL to