diff options
| author | Ben Elliston <bje@gcc.gnu.org> | 2006-05-09 15:25:08 +1000 |
|---|---|---|
| committer | Ben Elliston <bje@gcc.gnu.org> | 2006-05-09 15:25:08 +1000 |
| commit | 5038b1e9dd5cd970e1928e8b6244d0636fafd2d2 (patch) | |
| tree | 7aea5c0c4070b1cc7f32772aada6ea67b503a4dd | |
| parent | 74be08f84e9f991cc101c8881ef6863e8dddd335 (diff) | |
| download | gcc-5038b1e9dd5cd970e1928e8b6244d0636fafd2d2.zip gcc-5038b1e9dd5cd970e1928e8b6244d0636fafd2d2.tar.gz gcc-5038b1e9dd5cd970e1928e8b6244d0636fafd2d2.tar.bz2 | |
Remove conflict marker around 2006-05-07.
From-SVN: r113643
| -rw-r--r-- | gcc/ChangeLog | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bc786cd..5da06ae 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -64,7 +64,6 @@ * tree-ssa-structalias.c (get_constraint_for_component_ref): Do not try to find zero-sized subvars. ->>>>>>> .r113631 2006-05-07 Richard Guenther <rguenther@suse.de> PR tree-optimization/27136 @@ -566,7 +565,6 @@ * basic-block.h (safe_insert_insn_on_edge): Removed. * cfgrtl.c (mark_killed_regs, safe_insert_insn_on_edge): Removed. - 2006-04-26 David Edelsohn <edelsohn@gnu.org> Paolo Bonzini <bonzini@gnu.org> |