Merge remote-tracking branch 'origin/master' into py3

microsoft · Oct 9, 2020 · 156771c · 156771c
2 parents 801b49c + 34ea423
commit 156771c
Show file tree

Hide file tree

Showing 143 changed files with 2,156 additions and 1,225 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,6 +30,8 @@ bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
+# VS Code build
+toolsrc/build
 # Ignore the executable
 /vcpkg
 /vcpkg.exe

diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # Vcpkg: Overview
 
 [中文总览](README_zh_CN.md)
+[Español](README_es.md)
 
 Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS.
 This tool and ecosystem are constantly evolving, and we always appreciate contributions!