aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eca498c..d5f8559 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -23,7 +23,6 @@
mode macro.
(*truncxf?f_i387 splitter): Ditto.
->>>>>>> .r123627
2007-04-06 Daniel Berlin <dberlin@dberlin.org>
* langhooks-def.h (LANG_HOOKS_INITIALIZER): Remove