aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 01ad71a..193607a 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -106,7 +106,6 @@
* java/lang/natObject.cc: Move thread synchronization primitives to
system-dependent headers.
->>>>>>> 1.1231
2002-03-09 Adam Megacz <adam@xwt.org>
* java/io/natFileDescriptorWin32.cc (read): Return -1 if zero