summaryrefslogtreecommitdiffstats
path: root/libjava/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/ChangeLog')
-rw-r--r--libjava/ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b0fcc8603d3..e32ff8c4fbe 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,14 @@
2004-09-21 Andreas Tobler <a.tobler@schweiz.ch>
+ * javax/security/auth/x500/X500Principal.java: Fix some merge glitches.
+
+2004-09-21 Michael Koch <konqueror@gmx.de>
+
+ * javax/net/ssl/SSLServerSocket.java:
+ Removed comment about "Do not edit this file, it's generated.".
+
+2004-09-21 Andreas Tobler <a.tobler@schweiz.ch>
+
Import the big Crypto/Jessie/Security merge from Classpath.
* Makefile.am: Add imported files.
OpenPOWER on IntegriCloud