Merge commit 'pull/1131'

This commit is contained in:
Carl Suster 2014-07-08 11:42:04 +10:00
commit b5385840ff

View File

@ -131,17 +131,17 @@ publish/
*.pubxml *.pubxml
# NuGet Packages # NuGet Packages
packages/* **/packages/*
*.nupkg *.nupkg
## TODO: If the tool you use requires repositories.config ## TODO: If the tool you use *requires* repositories.config, (note that this file is normally regenerated so you should not need it in source control)
## uncomment the next line ## uncomment the next line
#!packages/repositories.config #!**/packages/repositories.config
# Enable "build/" folder in the NuGet Packages folder since # Enable "build/" folder in the NuGet Packages folder since
# NuGet packages use it for MSBuild targets. # NuGet packages use it for MSBuild targets.
# This line needs to be after the ignore of the build folder # This line needs to be after the ignore of the build folder
# (and the packages folder if the line above has been uncommented) # (and the packages folder if the line above has been uncommented)
!packages/build/ !**/packages/build/
# Windows Azure Build Output # Windows Azure Build Output
csx/ csx/