aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorAnthony Green <green@gcc.gnu.org>2001-11-08 15:13:11 +0000
committerAnthony Green <green@gcc.gnu.org>2001-11-08 15:13:11 +0000
commit3248fb6cc439e756430002bf78f01a9eb297babc (patch)
tree5c5c19aae443fe0e23250ce0f8c3e66d55a9251f /gcc
parentd6d26764790b91dd6b9e1b43304ec13f5c95913a (diff)
downloadgcc-3248fb6cc439e756430002bf78f01a9eb297babc.zip
gcc-3248fb6cc439e756430002bf78f01a9eb297babc.tar.gz
gcc-3248fb6cc439e756430002bf78f01a9eb297babc.tar.bz2
Somebody forgot a >>>>>>>>
From-SVN: r46844
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 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.