aboutsummaryrefslogtreecommitdiff
path: root/libjava/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/ChangeLog')
-rw-r--r--libjava/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c369ea54356..9343748e09d 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -43,7 +43,6 @@
Handle error cases. Added 'endp' argument.
* include/jvm.h (_Jv_FindClassFromSignature): Updated prototype.
->>>>>>> 1.3459
2005-04-05 Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt.