diff options
| author | R. Kelley Cook <kcook@gcc.gnu.org> | 2003-10-16 22:38:32 +0000 |
|---|---|---|
| committer | R. Kelley Cook <kcook@gcc.gnu.org> | 2003-10-16 22:38:32 +0000 |
| commit | f8e7e41aa978dff737b765151af8d7669bddaa5d (patch) | |
| tree | a6ff363cf7139f6a60e1d8cf3512bd4e567f5404 | |
| parent | 4c4809c175d40cfe30020c00e31959147005b411 (diff) | |
| download | gcc-f8e7e41aa978dff737b765151af8d7669bddaa5d.zip gcc-f8e7e41aa978dff737b765151af8d7669bddaa5d.tar.gz gcc-f8e7e41aa978dff737b765151af8d7669bddaa5d.tar.bz2 | |
eliminate conflict indicator
From-SVN: r72583
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bc4e49c..836c8f5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -55,7 +55,6 @@ (machopic_legitimize_pic_address): Improve codegen in dynamic-no-pic case. ->>>>>>> 2.1435 2003-10-15 Gábor Lóki <alga@rgai.hu> * fold-const.c (tree_swap_operands_p): Disable some features |