summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce McKinlay <bryce@gcc.gnu.org>2002-03-04 01:01:08 +0000
committerBryce McKinlay <bryce@gcc.gnu.org>2002-03-04 01:01:08 +0000
commit224c4888946357ac9643ba9b00ee07281e7a0cc8 (patch)
treec1246bc3e73712971a413beee961dfee5e4a0dc4
parentbc24faf8632c768fb8edb66078c7084167012eb0 (diff)
downloadgcc-224c4888946357ac9643ba9b00ee07281e7a0cc8.tar.gz
Remove cvs junk
From-SVN: r50271
-rw-r--r--libjava/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ed0b35ce06d..afadd005f9f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -27,7 +27,6 @@
* configure: Rebuilt.
* configure.in (GCJVERSION): Removed.
->>>>>>> 1.1201
2002-02-26 Andreas Schwab <schwab@suse.de>
* acinclude.m4 (LIB_AC_PROG_CXX): Use glibjava_CXX instead of