projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bc24faf)
Remove cvs junk
authorBryce McKinlay <bryce@gcc.gnu.org>
Mon, 4 Mar 2002 01:01:08 +0000 (01:01 +0000)
committerBryce McKinlay <bryce@gcc.gnu.org>
Mon, 4 Mar 2002 01:01:08 +0000 (01:01 +0000)
From-SVN: r50271

libjava/ChangeLog patch | blob | history

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ed0b35ce06de946aa358c458348839f23ef347e8..afadd005f9f48d5db759be1cf5f90d4c6788d022 100644 (file)
--- 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