mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-22 14:39:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

[multiple changes]

Browse Source 
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
This commit is contained in:
Andreas Tobler 2004-09-21 13:25:26 +02:00
parent 77747e5f2d
commit 936f1f0641
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libjava/ChangeLog
View File

@ -1,3 +1,12 @@
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.

1
libjava/javax/net/ssl/SSLServerSocket.java
View File

@ -1,4 +1,3 @@
// THIS IS A GENERATED FILE. DO NOT EDIT. -*- buffer-read-only: t -*-
/* SSLServerSocket.java -- a server socket for SSL connections.
Copyright (C) 2004 Free Software Foundation, Inc.

4
libjava/javax/security/auth/x500/X500Principal.java
View File

@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@ -121,7 +121,7 @@ public final class X500Principal implements Principal, Serializable
iae.initCause (ioe);
throw iae;
}
}
}
public X500Principal (byte[] encoded)
{