]> granicus.if.org Git - icu/commit
ICU-10802 Merge branch tkeep/10802andy into trunk.
authorTravis Keep <keep94@gmail.com>
Wed, 20 Aug 2014 21:46:02 +0000 (21:46 +0000)
committerTravis Keep <keep94@gmail.com>
Wed, 20 Aug 2014 21:46:02 +0000 (21:46 +0000)
commitf335b55bdf7f669f930f7c6d06193c021fd92edb
tree9256122f7f2174f0c2519c52d2fa49cec8b0962d
parentf2eb57e036e52238181f1bdd1fcae929bf3d49a0
ICU-10802 Merge branch tkeep/10802andy into trunk.

X-SVN-Rev: 36214
32 files changed:
.gitattributes
icu4c/source/common/Makefile.in
icu4c/source/common/common.vcxproj
icu4c/source/common/common.vcxproj.filters
icu4c/source/common/sharedobject.cpp
icu4c/source/common/sharedobject.h
icu4c/source/common/ucln_cmn.h
icu4c/source/common/unifiedcache.cpp [new file with mode: 0644]
icu4c/source/common/unifiedcache.h [new file with mode: 0644]
icu4c/source/i18n/coll.cpp
icu4c/source/i18n/collationbuilder.cpp
icu4c/source/i18n/collationroot.cpp
icu4c/source/i18n/collationroot.h
icu4c/source/i18n/collationtailoring.cpp
icu4c/source/i18n/collationtailoring.h
icu4c/source/i18n/measfmt.cpp
icu4c/source/i18n/numfmt.cpp
icu4c/source/i18n/plurrule.cpp
icu4c/source/i18n/reldatefmt.cpp
icu4c/source/i18n/rulebasedcollator.cpp
icu4c/source/i18n/ucln_in.h
icu4c/source/i18n/ucol_imp.h
icu4c/source/i18n/ucol_res.cpp
icu4c/source/i18n/unicode/tblcoll.h
icu4c/source/test/intltest/Makefile.in
icu4c/source/test/intltest/intltest.vcxproj
icu4c/source/test/intltest/intltest.vcxproj.filters
icu4c/source/test/intltest/itutil.cpp
icu4c/source/test/intltest/measfmttest.cpp
icu4c/source/test/intltest/tsmthred.cpp
icu4c/source/test/intltest/tsmthred.h
icu4c/source/test/intltest/unifiedcachetest.cpp [new file with mode: 0644]