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
authorduke
Wed, 05 Jul 2017 22:11:16 +0200
changeset 40785 0ad35b2dfc50
parent 40784 36d7560ae09e (current diff)
parent 40783 eecdf7525f79 (diff)
child 40820 535c39eb136d
Merge
--- a/.hgtags-top-repo	Thu Sep 08 21:11:53 2016 +0000
+++ b/.hgtags-top-repo	Wed Jul 05 22:11:16 2017 +0200
@@ -377,3 +377,4 @@
 a24702d4d5ab0015a5c553ed57f66fce7d85155e jdk-9+132
 be1218f792a450dfb5d4b1f82616b9d95a6a732e jdk-9+133
 065724348690eda41fc69112278d8da6dcde548c jdk-9+134
+82b94cb5f342319d2cda77f9fa59703ad7fde576 jdk-9+135
--- a/make/CompileJavaModules.gmk	Thu Sep 08 21:11:53 2016 +0000
+++ b/make/CompileJavaModules.gmk	Wed Jul 05 22:11:16 2017 +0200
@@ -458,7 +458,7 @@
 jdk.localedata_COPY := _dict _th
 # Exclude BreakIterator classes that are just used in compile process to generate
 # data files and shouldn't go in the product
-jdk.localedata_EXCLUDE_FILES += sun/text/resources/th/BreakIteratorRules_th.java
+jdk.localedata_EXCLUDE_FILES += sun/text/resources/ext/BreakIteratorRules_th.java
 
 ################################################################################
 # Setup the compilation for the module
jdk-sandbox