diff options
| author | Aldy Hernandez <aldyh@gcc.gnu.org> | 2002-01-22 18:35:50 +0000 |
|---|---|---|
| committer | Aldy Hernandez <aldyh@gcc.gnu.org> | 2002-01-22 18:35:50 +0000 |
| commit | 1b21d6a00425ba1eaef5124699c1fc8e9d957152 (patch) | |
| tree | ae5b2d66f4fcc5e9ad256c3bd2416eefb175658f | |
| parent | 2b672c08f3739635275d93dbd1fceadbaf504bf2 (diff) | |
| download | gcc-1b21d6a00425ba1eaef5124699c1fc8e9d957152.zip gcc-1b21d6a00425ba1eaef5124699c1fc8e9d957152.tar.gz gcc-1b21d6a00425ba1eaef5124699c1fc8e9d957152.tar.bz2 | |
fix conflicts
From-SVN: r49083
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index eb94791..85967b4 100644 --- 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. |