* java/text/DateFormatSymbols.java: Re-merged with Classpath.

From-SVN: r45420

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e867cbfcf7b91fc262294067871aa992d9276694..b5f91cd3334443333a3378334d59dcdadb4e46ea 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-05  Tom Tromey  <tromey@redhat.com>
+
+       * java/text/DateFormatSymbols.java: Re-merged with Classpath.
+
 2001-09-05  Corey Minyard  <minyard@acm.org>
            Tom Tromey  <tromey@redhat.com>
 

diff --git a/libjava/java/text/DateFormatSymbols.java b/libjava/java/text/DateFormatSymbols.java
index 4f45a4dbfbdda951f522111b346807edcdb49772..97189f7608cc6f7f01adabe537dea4a89081878e 100644 (file)
--- a/libjava/java/text/DateFormatSymbols.java
+++ b/libjava/java/text/DateFormatSymbols.java
@@ -1,10 +1,29 @@
-/* Copyright (C) 1998, 1999, 2000, 2001  Free Software Foundation
+/* ChoiceFormat.java -- Format over a range of numbers
+   Copyright (C) 1998, 1999, 2000, 2001 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.
+
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
 
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
 
 package java.text;