[multiple changes]
commit936f1f064115f94425c521a5c94f0957f67a480d
authorAndreas Tobler <andreast@gcc.gnu.org>
Tue, 21 Sep 2004 11:25:26 +0000 (21 13:25 +0200)
committerAndreas Tobler <andreast@gcc.gnu.org>
Tue, 21 Sep 2004 11:25:26 +0000 (21 13:25 +0200)
treecd703e0acbe11a854bb1b4125a1f870691690670
parent77747e5f2d1fc0bc4dc4aaf137da9dc158697c81
[multiple changes]

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.".

From-SVN: r87800
libjava/ChangeLog
libjava/javax/net/ssl/SSLServerSocket.java
libjava/javax/security/auth/x500/X500Principal.java