[kaffe] CVS kaffe (robilad): Resynced with gnu classpath: cleanup

[Kaffe CVS]

PatchSet 6470 
Date: 2005/05/15 09:07:00
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with gnu classpath: cleanup
2005-05-15  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-04-26  Michael Koch  <konqueror at gmx.de>

        * javax/swing/ImageIcon.java:
        Merged copyright with GCJ.

Members: 
	ChangeLog:1.3997->1.3998 
	libraries/javalib/javax/swing/ImageIcon.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3997 kaffe/ChangeLog:1.3998
--- kaffe/ChangeLog:1.3997	Sat May 14 23:46:09 2005
+++ kaffe/ChangeLog	Sun May 15 09:07:00 2005
@@ -2,6 +2,15 @@
 
 	Resynced with GNU Classpath.
 
+	2005-04-26  Michael Koch  <konqueror at gmx.de>
+
+        * javax/swing/ImageIcon.java:
+        Merged copyright with GCJ.
+
+2005-05-15  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2005-04-25  Mark Wielaard  <mark at klomp.org>
 
         * native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c:
Index: kaffe/libraries/javalib/javax/swing/ImageIcon.java
diff -u kaffe/libraries/javalib/javax/swing/ImageIcon.java:1.5 kaffe/libraries/javalib/javax/swing/ImageIcon.java:1.6
--- kaffe/libraries/javalib/javax/swing/ImageIcon.java:1.5	Tue Apr 19 00:01:53 2005
+++ kaffe/libraries/javalib/javax/swing/ImageIcon.java	Sun May 15 09:07:04 2005
@@ -1,5 +1,5 @@
 /* ImageIcon.java --
-   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.