Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authormfang
Tue, 12 Apr 2011 18:58:06 -0700
changeset 9047 bea2ab79ac15
parent 9046 c70a26ba4d21 (current diff)
parent 9037 0fcc24435ae4 (diff)
child 9049 70b342493c76
Merge
--- a/jdk/make/java/util/FILES_properties.gmk	Mon Apr 11 16:19:20 2011 -0700
+++ b/jdk/make/java/util/FILES_properties.gmk	Tue Apr 12 18:58:06 2011 -0700
@@ -55,6 +55,7 @@
         sun/util/resources/LocaleNames_mt.properties \
         sun/util/resources/LocaleNames_nl.properties \
         sun/util/resources/LocaleNames_no.properties \
+        sun/util/resources/LocaleNames_no_NO_NY.properties \
         sun/util/resources/LocaleNames_pl.properties \
         sun/util/resources/LocaleNames_pt.properties \
         sun/util/resources/LocaleNames_pt_BR.properties \
jdk-sandbox