projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2b672c0)
fix conflicts
authorAldy Hernandez <aldyh@gcc.gnu.org>
Tue, 22 Jan 2002 18:35:50 +0000 (18:35 +0000)
committerAldy Hernandez <aldyh@gcc.gnu.org>
Tue, 22 Jan 2002 18:35:50 +0000 (18:35 +0000)
From-SVN: r49083

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eb947914c232225ff7ac5e60b3deaa895a937c42..85967b4d1c78b2f7a32d0980b669c7c147de3e0d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -120,7 +120,6 @@ Tue Jan 22 06:26:33 2002  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
        (sparc-*-netbsd*): Add netbsd-aout.h to tm_file.
        (vax-*-netbsd*): Add netbsd-aout.h to tm_file.
 
->>>>>>> 1.12770
 2002-01-21  John David Anglin  <dave@hiauly1.hia.nrc.ca>
 
        * pa-protos.h (reg_before_reload_operand): New function prototype.