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 ff6249e..67301eb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -212,7 +212,6 @@ * fold-const.c (tree_expr_nonzero_p): Use get_base_address before assuming an ADDR_EXPR is non-null. ->>>>>>> 2.5169 2004-08-30 Jason Merrill <jason@redhat.com> * gthr-posix.h, gthr-dce.h: Add #pragma weaks. |