Skip to content

Commit 6c1848c

Browse files
author
David Kline
authored
Merge pull request #2900 from Microsoft/htk_development
Merge 2017.4.2 release from htk_development to master
2 parents 08f90ee + 6b89d53 commit 6c1848c

File tree

90 files changed

+231717
-703
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+231717
-703
lines changed

.gitignore

+11
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,16 @@ obj/
4141
*.idb
4242
*.opendb
4343

44+
# ============================ #
45+
# Visual Studio Code Generated #
46+
# ============================ #
47+
.vscode/
48+
49+
# ===================== #
50+
# Project Specific List #
51+
# ===================== #
52+
artifacts/
4453
Assets/ThirdParty/
4554
Assets/ThirdParty.meta
55+
Assets/TextMesh Pro.meta
56+
Assets/TextMesh Pro/

0 commit comments

Comments
 (0)