ICU-12410 class Edits, class CaseMap with new low-level functions that work with...

X-SVN-Rev: 39684

diff --cc icu4c/source/common/charstr.cpp
Simple merge

diff --cc icu4c/source/common/common.vcxproj
Simple merge

diff --cc icu4c/source/common/locdspnm.cpp
Simple merge

diff --cc icu4c/source/common/locid.cpp
Simple merge

diff --cc icu4c/source/common/loclikely.cpp
Simple merge

diff --cc icu4c/source/common/ucase.cpp
Simple merge

diff --cc icu4c/source/common/ucase.h
Simple merge

diff --cc icu4c/source/common/ucasemap.cpp
Simple merge

diff --cc icu4c/source/common/ucasemap_titlecase_brkiter.cpp
Simple merge

diff --cc icu4c/source/common/ucnv_ext.cpp
Simple merge

diff --cc icu4c/source/common/unicode/locid.h
Simple merge

diff --cc icu4c/source/common/unicode/ucasemap.h
Simple merge

diff --cc icu4c/source/common/unicode/uenum.h
Simple merge

diff --cc icu4c/source/common/unicode/unistr.h
Simple merge

diff --cc icu4c/source/common/uniset_closure.cpp
Simple merge

diff --cc icu4c/source/common/uniset_props.cpp
Simple merge

diff --cc icu4c/source/common/unistr_case.cpp
Simple merge

diff --cc icu4c/source/common/unistr_case_locale.cpp
Simple merge

diff --cc icu4c/source/common/unistr_titlecase_brkiter.cpp
Simple merge

diff --cc icu4c/source/common/unormcmp.cpp
Simple merge

diff --cc icu4c/source/common/uprops.cpp
Simple merge

diff --cc icu4c/source/common/ustr_imp.h
Simple merge

diff --cc icu4c/source/common/ustr_titlecase_brkiter.cpp
Simple merge

diff --cc icu4c/source/common/ustrcase.cpp
Simple merge

diff --cc icu4c/source/common/ustrcase_locale.cpp
Simple merge

diff --cc icu4c/source/common/ustring.cpp
Simple merge

diff --cc icu4c/source/i18n/affixpatternparser.cpp
Simple merge

diff --cc icu4c/source/i18n/casetrn.cpp
Simple merge

diff --cc icu4c/source/i18n/casetrn.h
Simple merge

diff --cc icu4c/source/i18n/currpinf.cpp
Simple merge

diff --cc icu4c/source/i18n/decimfmt.cpp
Simple merge

diff --cc icu4c/source/i18n/measfmt.cpp
Simple merge

diff --cc icu4c/source/i18n/plurrule_impl.h
Simple merge

diff --cc icu4c/source/i18n/rbnf.cpp
index 08d6962048f597359f930820fa160fb376e65362,94e870e40211afd12cada871dae3864db39377da..5999d00d95923ef6a8f0365716119bdeb5959346
--- 1/icu4c/source/i18n/rbnf.cpp
--- 2/icu4c/source/i18n/rbnf.cpp
+++ b/icu4c/source/i18n/rbnf.cpp
@@@ -27,6 -27,8 +27,7 @@@
  #include "unicode/udata.h"
  #include "unicode/udisplaycontext.h"
  #include "unicode/brkiter.h"
 -#include "nfrs.h"
+ #include "unicode/ucasemap.h"
  
  #include "cmemory.h"
  #include "cstring.h"

diff --cc icu4c/source/i18n/regeximp.cpp
Simple merge

diff --cc icu4c/source/i18n/regeximp.h
Simple merge

diff --cc icu4c/source/i18n/reldatefmt.cpp
Simple merge

diff --cc icu4c/source/i18n/reldtfmt.cpp
Simple merge

diff --cc icu4c/source/i18n/smpdtfmt.cpp
Simple merge

diff --cc icu4c/source/i18n/titletrn.cpp
Simple merge

diff --cc icu4c/source/i18n/tzfmt.cpp
Simple merge

diff --cc icu4c/source/i18n/tzgnames.cpp
Simple merge

diff --cc icu4c/source/i18n/tznames_impl.cpp
Simple merge

diff --cc icu4c/source/i18n/unicode/alphaindex.h
Simple merge

diff --cc icu4c/source/i18n/unicode/coleitr.h
Simple merge

diff --cc icu4c/source/i18n/unicode/dcfmtsym.h
Simple merge

diff --cc icu4c/source/i18n/unicode/reldatefmt.h
Simple merge

diff --cc icu4c/source/i18n/zonemeta.cpp
Simple merge

diff --cc icu4c/source/test/cintltst/cstrcase.c
Simple merge

diff --cc icu4c/source/test/cintltst/cucdtst.c
Simple merge

diff --cc icu4c/source/test/intltest/apicoll.cpp
Simple merge

diff --cc icu4c/source/test/intltest/locnmtst.cpp
Simple merge

diff --cc icu4c/source/test/intltest/measfmttest.cpp
Simple merge

diff --cc icu4c/source/test/intltest/numfmtst.cpp
Simple merge

diff --cc icu4c/source/test/intltest/strcase.cpp
Simple merge

diff --cc icu4c/source/test/intltest/tmsgfmt.cpp
Simple merge

diff --cc icu4c/source/test/intltest/tzrulets.cpp
Simple merge

diff --cc icu4c/source/test/intltest/ustrtest.cpp
Simple merge

diff --cc icu4c/source/test/intltest/ustrtest.h
Simple merge

diff --cc icu4c/source/tools/gendict/gendict.cpp
Simple merge

diff --cc icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSet.java
Simple merge