aboutsummaryrefslogtreecommitdiff
path: root/toolsrc
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-02-07 17:47:53 -0800
committerRobert Schumacher <roschuma@microsoft.com>2018-02-07 17:47:53 -0800
commit1e3435e32bc96ad59534238c45ebe00c708daf37 (patch)
tree537fa027b41db1a3c7b12b50445d6955a518b999 /toolsrc
parent116914e110e06183eaa8626accf1403637b6b681 (diff)
parent3aac3957ae9053eb3ffb97bcc49148e7b0a4c050 (diff)
downloadvcpkg-1e3435e32bc96ad59534238c45ebe00c708daf37.tar.gz
vcpkg-1e3435e32bc96ad59534238c45ebe00c708daf37.zip
Merge branch 'master' of https://github.com/Microsoft/vcpkg
Diffstat (limited to 'toolsrc')
-rw-r--r--toolsrc/vcpkg.sln1
1 files changed, 0 insertions, 1 deletions
diff --git a/toolsrc/vcpkg.sln b/toolsrc/vcpkg.sln
index c2df757fc..6c429cff9 100644
--- a/toolsrc/vcpkg.sln
+++ b/toolsrc/vcpkg.sln
@@ -16,7 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{F589
..\scripts\bootstrap.ps1 = ..\scripts\bootstrap.ps1
..\scripts\fetchDependency.ps1 = ..\scripts\fetchDependency.ps1
..\scripts\findAnyMSBuildWithCppPlatformToolset.ps1 = ..\scripts\findAnyMSBuildWithCppPlatformToolset.ps1
- ..\scripts\findFileRecursivelyUp.ps1 = ..\scripts\findFileRecursivelyUp.ps1
..\scripts\findVisualStudioInstallationInstances.ps1 = ..\scripts\findVisualStudioInstallationInstances.ps1
..\scripts\get_triplet_environment.cmake = ..\scripts\get_triplet_environment.cmake
..\scripts\getProgramFiles32bit.ps1 = ..\scripts\getProgramFiles32bit.ps1