]> granicus.if.org Git - icu/commit
ICU-21578 Merging maint/maint-69 into main (conflict: icudata.jar) 1695/head
authorShane Carr <shane@unicode.org>
Wed, 7 Apr 2021 22:15:05 +0000 (15:15 -0700)
committerShane Carr <shane@unicode.org>
Wed, 7 Apr 2021 22:15:05 +0000 (15:15 -0700)
commitbc22e421bf6967a26670f3510c4b41f99883fbe2
tree1b1c692a7596e1d945ee60eb0aabbe595ae2de56
parent72de651291a1a4894cd9be8f4ecdddb960e47075
parent0e7b4428866f3133b4abba2d932ee3faa708db1d
ICU-21578 Merging maint/maint-69 into main (conflict: icudata.jar)
icu4c/source/common/filteredbrk.cpp
icu4c/source/common/locid.cpp
icu4c/source/test/testdata/rbbitst.txt
icu4j/main/shared/data/icudata.jar
icu4j/main/shared/data/icutzdata.jar
icu4j/main/tests/core/src/com/ibm/icu/dev/test/rbbi/rbbitst.txt