Merge pull request #2900 from Microsoft/htk_development

Merge 2017.4.2 release from htk_development to master
microsoft · Oct 9, 2018 · 6c1848c · 6c1848c
2 parents 08f90ee + 6b89d53
commit 6c1848c
Show file tree

Hide file tree

Showing 90 changed files with 231,717 additions and 703 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,5 +41,16 @@ obj/
 *.idb
 *.opendb
 
+# ============================ #
+# Visual Studio Code Generated #
+# ============================ #
+.vscode/
+
+# ===================== #
+# Project Specific List #
+# ===================== #
+artifacts/
 Assets/ThirdParty/
 Assets/ThirdParty.meta
+Assets/TextMesh Pro.meta
+Assets/TextMesh Pro/