[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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b0fcc8603d3ecb2433a9230b77921c49b70525cc..e32ff8c4fbeff92b0587761de40b796223a0fa3a 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -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.

diff --git a/libjava/javax/net/ssl/SSLServerSocket.java b/libjava/javax/net/ssl/SSLServerSocket.java
index eab92a23fb501839ceb8f89f658db80c7240b441..fee99f48e4b0aaa4a4d09755b1c44e0b04ccadff 100644 (file)
--- a/libjava/javax/net/ssl/SSLServerSocket.java
+++ b/libjava/javax/net/ssl/SSLServerSocket.java
@@ -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.
 

diff --git a/libjava/javax/security/auth/x500/X500Principal.java b/libjava/javax/security/auth/x500/X500Principal.java
index 95f80fc582303d0ad3e455706fa7012d482027ca..201a195cbca2a0603da0c849d566d3b4ba3b4362 100644 (file)
--- a/libjava/javax/security/auth/x500/X500Principal.java
+++ b/libjava/javax/security/auth/x500/X500Principal.java
@@ -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)
   {