]> granicus.if.org Git - icu/commit
Merge branch 'master' into units-staging
authorShane Carr <shane@unicode.org>
Fri, 13 Mar 2020 04:15:44 +0000 (21:15 -0700)
committerShane Carr <shane@unicode.org>
Fri, 13 Mar 2020 04:15:44 +0000 (21:15 -0700)
commit2eac56eb519369d7ae806cbab9b309b296a4e2b3
tree1086b7499d39dbbbf4742606960deacc57459dcc
parent4be0a2bc55fc3567f790a53cc988abd4c3508419
parent2d83fc2278c349275ca33ffb9a30789c9c6d4154
Merge branch 'master' into units-staging

Conflicts:
icu4c/source/data/misc/supplementalData.txt
icu4c/source/data/misc/supplementalData.txt
icu4c/source/i18n/Makefile.in
icu4c/source/test/intltest/numbertest_api.cpp
icu4c/source/test/intltest/numfmtst.cpp
tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java