[classpath-095-merge-branch] Merge classpath bits into files copied into libjava

[Matthias Klose]

Attached are the low hanging fruit merges for the bits mentioned in
http://gcc.gnu.org/ml/java/2007-05/msg00044.html

The diffs are attached as cp-merge.diff, the outstanding files are attached as
unmerged.diff.

Checked into the classpath-095-merge-branch.

  Matthias


 2007-05-17  Matthias Klose  <doko@ubuntu.com>

        Merged from classpath:
        * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
        * java/lang/System.java(inheritedChannel): New.
        * java/lang/Character.java: Remove stray`;'.
        * java/net/MulticastSocket.java: Merged.
        * java/text/DateFormatSymbols.java(getInstance): New, comment updates.
        * java/text/Collator.java(getInstance): Merged.
        * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
        getDisplayName, getDisplayNames: New.
        * java/util/logging/Logger.java: Merged.
        * Regenerate .class and .h files.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: cp-merge.diff
URL: <http://gcc.gnu.org/pipermail/java-patches/attachments/20070517/8f878735/attachment.ksh>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: unmerged.diff
URL: <http://gcc.gnu.org/pipermail/java-patches/attachments/20070517/8f878735/attachment-0001.ksh>