summaryrefslogtreecommitdiffstats
path: root/libjava/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/ChangeLog')
-rw-r--r--libjava/ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 17a07fddfdd..298d2880267 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-03 Thomas Fitzsimmons <fitzsim@redhat.com>
+
+ * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
+ (init_glib_threads): Check if threading system is already
+ initialized.
+
2005-05-03 Andrew Overholt <overholt@redhat.com>
PR libgcj/21372:
@@ -136,6 +142,7 @@
* gnu/java/net/protocol/file/Connection.java
(lineSeparator): Initialize with SystemProperties.getProperty().
+>>>>>>> 1.3571
2005-04-27 Chris Burdess <dog@gnu.org>
* gnu/java/net/protocol/file/Connection.java: Return correct content
OpenPOWER on IntegriCloud