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 af67a57..2f3b701 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -247,7 +247,6 @@ Sat Mar 16 12:57:28 CET 2002 Jan HUbicka <jh@suse.cz>
(COMMAND_LINE_OPTIONS): Remove OPT_MD, OPT_MMD.
(cpp_handle_option): Update.
->>>>>>> 1.13408
2002-03-15 Chris Demetriou <cgd@broadcom.com>
* config/mips/mips.h (SUBTARGET_CPP_SIZE_SPEC): Provide an