projects / platform / upstream / linaro-gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 99f5f7d)
fix conflicts
authoraldyh <aldyh@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 22 Jan 2002 18:35:50 +0000 (18:35 +0000)
committeraldyh <aldyh@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 22 Jan 2002 18:35:50 +0000 (18:35 +0000)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49083 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eb94791..85967b4 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.
Domain: System / Toolchain;