Merge jdk7-b64

Tue, 07 Jul 2009 23:13:09 -0700

author
yan
date
Tue, 07 Jul 2009 23:13:09 -0700
changeset 319
d8f23a81d46f
parent 315
24374861f91e
parent 318
09dc14c713f0
child 320
7e0056ded28c

Merge

     1.1 --- a/src/share/classes/com/sun/tools/javac/resources/legacy.properties	Fri Jul 03 09:16:14 2009 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/resources/legacy.properties	Tue Jul 07 23:13:09 2009 -0700
     1.3 @@ -112,6 +112,7 @@
     1.4  com.sun.java.swing.plaf.motif = tiger legacy
     1.5  com.sun.java.swing.plaf.motif.icons = tiger legacy
     1.6  com.sun.java.swing.plaf.motif.resources = tiger legacy
     1.7 +com.sun.java.swing.plaf.nimbus = tiger legacy
     1.8  com.sun.java.swing.plaf.windows = tiger legacy
     1.9  com.sun.java.swing.plaf.windows.icons = tiger legacy
    1.10  com.sun.java.swing.plaf.windows.resources = tiger legacy
    1.11 @@ -378,6 +379,7 @@
    1.12  javax.swing.plaf.metal.icons.ocean = tiger legacy
    1.13  javax.swing.plaf.metal.sounds = tiger legacy
    1.14  javax.swing.plaf.multi = tiger legacy
    1.15 +javax.swing.plaf.nimbus = tiger legacy
    1.16  javax.swing.plaf.synth = tiger legacy
    1.17  javax.swing.table = tiger legacy
    1.18  javax.swing.text = tiger legacy

mercurial