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

[Kaffe CVS]

PatchSet 4273 
Date: 2004/01/03 03:56:50
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath

2004-01-03  Dalibor Topic <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2003-12-26  Michael Koch  <konqueror at gmx.de>

        * java/text/Format.java (serialVersionUID): Fixed value.

Members: 
	ChangeLog:1.1860->1.1861 
	libraries/javalib/java/text/Format.java:1.13->1.14 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1860 kaffe/ChangeLog:1.1861
--- kaffe/ChangeLog:1.1860	Sat Jan  3 03:45:25 2004
+++ kaffe/ChangeLog	Sat Jan  3 03:56:50 2004
@@ -2,6 +2,14 @@
 
 	Resynced with GNU Classpath.
 
+	2003-12-26  Michael Koch  <konqueror at gmx.de>
+
+        * java/text/Format.java (serialVersionUID): Fixed value.
+
+2004-01-03  Dalibor Topic <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2003-11-27  Dalibor Topic <robilad at kaffe.org>
 
         * java/text/FieldPosition.java (equals): Fixed comment.
Index: kaffe/libraries/javalib/java/text/Format.java
diff -u kaffe/libraries/javalib/java/text/Format.java:1.13 kaffe/libraries/javalib/java/text/Format.java:1.14
--- kaffe/libraries/javalib/java/text/Format.java:1.13	Thu Dec  4 03:14:37 2003
+++ kaffe/libraries/javalib/java/text/Format.java	Sat Jan  3 03:56:52 2004
@@ -1,5 +1,5 @@
 /* Format.java -- Abstract superclass for formatting/parsing strings.
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2003  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -63,7 +63,7 @@
  */
 public abstract class Format implements Serializable, Cloneable
 {
-  static final long serialVersionUID = 4479235611355683992L;
+  static final long serialVersionUID = -299282585814624189L;
 
   public static class Field extends AttributedCharacterIterator.Attribute
   {