diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 28eda6e..b3c1fe3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -35,7 +35,6 @@ * reload1.c (gen_reload): Call mark_jump_label on the new insns generated by gen_move_insn to add REG_LABEL notes if necessary. ->>>>>>> .r114926 2006-06-22 Bob Wilson <bob.wilson@acm.org> * config/xtensa/lib1funcs.asm (MIN_ESA): Delete. |