summaryrefslogtreecommitdiffstats
path: root/libjava
diff options
context:
space:
mode:
authorbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2002-03-04 01:01:08 +0000
committerbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2002-03-04 01:01:08 +0000
commiteaf01ccb35550f8e69f874b59f9e4c8abe0c291c (patch)
treec1246bc3e73712971a413beee961dfee5e4a0dc4 /libjava
parentde40ba3a6579157cb753ade5ebcb6215c6e7bdbc (diff)
downloadppe42-gcc-eaf01ccb35550f8e69f874b59f9e4c8abe0c291c.tar.gz
ppe42-gcc-eaf01ccb35550f8e69f874b59f9e4c8abe0c291c.zip
Remove cvs junk
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50271 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-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
OpenPOWER on IntegriCloud