aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 941007b..4d78b4d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -50,7 +50,6 @@
Only apply the optimization for rounding builtins if the inner
cast is also an extension.
->>>>>>> 2.10143
2005-10-11 Andrew Pinski <pinskia@physics.uc.edu>
PR tree-opt/23946