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 2e947ea..e16a312 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -495,7 +495,6 @@
(arc_rodata_string, TARGET_OPTIONS): Delete.
* config/arc/arc.opt: New file.
->>>>>>> 2.7930
2005-03-17 Richard Henderson <rth@redhat.com>
* doc/extend.texi (Weak Pragmas): New section.