Merge pull request #1 from Microsoft/master

update
microsoft · May 11, 2018 · 9535a56 · 9535a56
2 parents 92eb878 + 9a19dae
commit 9535a56
Show file tree

Hide file tree

Showing 887 changed files with 12,283 additions and 9,876 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@ bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
+vcpkg
 
 # Visual Studio 2015 cache/options directory
 .vs/
@@ -273,13 +274,14 @@ __pycache__/
 ############################################################
 
 .vscode/
+*.code-workspace
 buildtrees/
 build*/
 downloads/
 installed*/
 packages/
 scripts/buildsystems/tmp/
-#ignore custom triplets 
+#ignore custom triplets
 triplets/*
 #add vcpkg-designed triplets back in
 !triplets/arm-uwp.cmake
@@ -292,9 +294,11 @@ triplets/*
 !triplets/x86-windows-static.cmake
 !triplets/arm64-uwp.cmake
 !triplets/arm64-windows.cmake
+!triplets/x64-linux.cmake
+!triplets/x64-osx.cmake
 *.exe
 *.zip
 
 ############################################################
 # vcpkg - End
-############################################################
+############################################################