summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 661380ac4..bf92c59d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,7 +83,6 @@
* config-ml.in: Alter CCASFLAGS to include special
multilib options the same as is done for CFLAGS.
->>>>>>> 1.659
2006-05-31 Daniel Jacobowitz <dan@codesourcery.com>
* Makefile.def: Added dependencies from sim and gdb on intl, and