aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@gcc.gnu.org>2000-07-14 13:41:26 -0400
committerJason Merrill <jason@gcc.gnu.org>2000-07-14 13:41:26 -0400
commita41129f3ce07f2de7e5a284b88812622f8ea8c03 (patch)
tree758538e6b736f497750b3ac13a31d195c5244717
parent626d1efd40666cee2ff12d2ce2e34322b51c708f (diff)
downloadgcc-a41129f3ce07f2de7e5a284b88812622f8ea8c03.zip
gcc-a41129f3ce07f2de7e5a284b88812622f8ea8c03.tar.gz
gcc-a41129f3ce07f2de7e5a284b88812622f8ea8c03.tar.bz2
tweak
From-SVN: r35037
-rw-r--r--gcc/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e723556..ff1ddd4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -397,7 +397,6 @@ Tue Jul 11 16:26:17 2000 Clinton Popetz <cpopetz@cygnus.com>
* cpp.texi: Update.
->>>>>>> 1.7094
2000-07-11 Neil Booth <NeilB@earthling.net>
* cppinit.c: (cpp_reader_init): Allow digraphs by default.