Piotr Puszkiewicz e8d805ee1e Merge remote-tracking branch 'refs/remotes/livarcocc/merge_rel101_into_master' ... Conflicts: TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj		2017-03-02 23:50:15 -08:00
..
DesktopTestProjects	Merge remote-tracking branch 'refs/remotes/livarcocc/merge_rel101_into_master'	2017-03-02 23:50:15 -08:00
LockFiles/ExportFiles	Fix package code for new NuGet.	2016-07-26 20:53:20 -05:00
NonRestoredTestProjects	Merge remote-tracking branch 'refs/remotes/dotnet/master'	2017-03-02 23:49:01 -08:00
TestPackages	Merge remote-tracking branch 'refs/remotes/livarcocc/merge_rel101_into_master'	2017-03-02 23:50:15 -08:00
TestProjects	Merge remote-tracking branch 'refs/remotes/dotnet/master'	2017-03-02 23:49:01 -08:00