[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath

Kaffe CVS cvs-commits at kaffe.org
Wed Feb 25 10:31:01 PST 2004


PatchSet 4459 
Date: 2004/02/25 18:11:30
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath

2004-02-24  Dalibor Topic <robilad at kaffe.org>

        Resynced with GNU Classpath

        2004-02-11  Michael Koch  <konqueror at gmx.de>

        * gnu/java/net/protocol/file/Connection.java:
        Reformated copyright boilerplate.

Members: 
	ChangeLog:1.2039->1.2040 
	libraries/javalib/gnu/java/net/protocol/file/Connection.java:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2039 kaffe/ChangeLog:1.2040
--- kaffe/ChangeLog:1.2039	Tue Feb 24 18:02:27 2004
+++ kaffe/ChangeLog	Wed Feb 25 18:11:30 2004
@@ -1,5 +1,14 @@
 2004-02-24  Dalibor Topic <robilad at kaffe.org>
 
+        Resynced with GNU Classpath
+
+	2004-02-11  Michael Koch  <konqueror at gmx.de>
+
+        * gnu/java/net/protocol/file/Connection.java:
+        Reformated copyright boilerplate.
+
+2004-02-24  Dalibor Topic <robilad at kaffe.org>
+
 	Resynced with GNU Classpath
 
 	2004-02-12  Michael Koch  <konqueror at gmx.de>
Index: kaffe/libraries/javalib/gnu/java/net/protocol/file/Connection.java
diff -u kaffe/libraries/javalib/gnu/java/net/protocol/file/Connection.java:1.4 kaffe/libraries/javalib/gnu/java/net/protocol/file/Connection.java:1.5
--- kaffe/libraries/javalib/gnu/java/net/protocol/file/Connection.java:1.4	Thu Jan  8 17:39:00 2004
+++ kaffe/libraries/javalib/gnu/java/net/protocol/file/Connection.java	Wed Feb 25 18:11:31 2004
@@ -1,41 +1,40 @@
-/*
-  FileURLConnection.java -- URLConnection class for "file" protocol
-  Copyright (C) 1998, 1999, 2003 Free Software Foundation, Inc.
-
-  This file is part of GNU Classpath.
-
-  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.
+/* FileURLConnection.java -- URLConnection class for "file" protocol
+   Copyright (C) 1998, 1999, 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with GNU Classpath; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-  02111-1307 USA.
-
-  Linking this library statically or dynamically with other modules is
-  making a combined work based on this library.  Thus, the terms and
-  conditions of the GNU General Public License cover the whole
-  combination.
-
-  As a special exception, the copyright holders of this library give you
-  permission to link this library with independent modules to produce an
-  executable, regardless of the license terms of these independent
-  modules, and to copy and distribute the resulting executable under
-  terms of your choice, provided that you also meet, for each linked
-  independent module, the terms and conditions of the license of that
-  module.  An independent module is a module which is not derived from
-  or based on this library.  If you modify this library, you may extend
-  this exception to your version of the library, but you are not
-  obligated to do so.  If you do not wish to do so, delete this
-  exception statement from your 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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.  */
+
 package gnu.java.net.protocol.file;
 
 import java.io.BufferedInputStream;




More information about the kaffe mailing list