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 bc4e49c..836c8f5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -55,7 +55,6 @@
(machopic_legitimize_pic_address): Improve codegen in dynamic-no-pic
case.
->>>>>>> 2.1435
2003-10-15 Gábor Lóki <alga@rgai.hu>
* fold-const.c (tree_swap_operands_p): Disable some features