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 e8389e1..a03ff2c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -383,7 +383,6 @@ Tue Nov 6 09:21:34 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
arrays.
Fixes PR c/461.
->>>>>>> 1.11778
2001-11-05 Zack Weinberg <zack@codesourcery.com>
* aclocal.m4: (AM_WITH_NLS): Don't look at ALL_LINGUAS.