martin-s d5a7da6bcb Merge branch 'master' of https://github.com/Microsoft/vcpkg into patch-vs2013 ... # Conflicts: # scripts/cmake/vcpkg_configure_cmake.cmake # toolsrc/src/vcpkg/vcpkgpaths.cpp		2017-11-05 19:13:16 +01:00
..
include	Merge branch 'master' of https://github.com/Microsoft/vcpkg into patch-vs2013	2017-11-05 19:13:16 +01:00
src	Merge branch 'master' of https://github.com/Microsoft/vcpkg into patch-vs2013	2017-11-05 19:13:16 +01:00
vcpkg	Remove unnecessary $(PlatformToolset) condition	2017-02-08 22:29:29 -08:00
vcpkglib	[vcpkg] Re-layout all files using new organization scheme.	2017-10-13 18:37:41 -07:00
vcpkgmetricsuploader	[vcpkg] Re-layout all files using new organization scheme.	2017-10-13 18:37:41 -07:00
vcpkgtest	[vcpkg] Fix bug where packages with uninstalled features appear to be uninstalled.	2017-10-31 03:47:35 -07:00
.clang-format	[clang-format] Standard: Cpp11	2017-04-28 12:57:15 -07:00
dirs.proj	Remove defunct reference to vcpkgcommon.vcxproj	2017-01-25 19:53:07 -08:00
vcpkg.sln	Remove vcpkgcommon.vcxproj. Merge it into vcpkglib.vcxproj	2017-01-25 19:50:56 -08:00
VERSION.txt	Update CHANGELOG and bump version to v0.0.96	2017-11-03 18:41:19 -07:00