mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-30 21:41:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove conflict marker around 2006-05-07.

Browse Source 
From-SVN: r113643
This commit is contained in:
Ben Elliston 2006-05-09 15:25:08 +10:00
parent 74be08f84e
commit 5038b1e9dd
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/ChangeLog
View File

@ -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>