ICU-7467 Merging branch to trunk 3

X-SVN-Rev: 39865

diff --git a/.gitignore b/.gitignore
index d7ecbb719ed1780c58d5e74fbfe8fdd694c8dafb..ab3a317eb78526043a53490d85f6fd3c47104e63 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ icu4c/bin64
 icu4c/include
 icu4c/lib
 icu4c/lib64
+icu4c/source/.vscode
 icu4c/source/Doxyfile
 icu4c/source/Makefile
 icu4c/source/README
@@ -24,6 +25,7 @@ icu4c/source/allinone/Debug
 icu4c/source/allinone/ipch
 icu4c/source/autom4te.cache
 icu4c/source/bin
+icu4c/source/browse.VC.db
 icu4c/source/common/*.ao
 icu4c/source/common/*.d
 icu4c/source/common/*.o
@@ -147,6 +149,7 @@ icu4c/source/layoutex/x64
 icu4c/source/layoutex/x86
 icu4c/source/lib
 icu4c/source/perf-*.xml
+icu4c/source/runShaneConfigureICU.sh
 icu4c/source/samples/*.opensdf
 icu4c/source/samples/*.sdf
 icu4c/source/samples/Makefile
@@ -370,6 +373,8 @@ icu4c/source/samples/ustring/ustring.out
 icu4c/source/samples/ustring/ustring.vcproj.*.*.user
 icu4c/source/samples/ustring/x64
 icu4c/source/samples/ustring/x86
+icu4c/source/shane.cpp
+icu4c/source/shane.exe
 icu4c/source/stubdata/*.ao
 icu4c/source/stubdata/*.d
 icu4c/source/stubdata/*.o