diff options
author | Lluis Sanchez <llsan@microsoft.com> | 2018-01-10 14:49:08 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-10 14:49:08 +0300 |
commit | 199a701c11838c547e789d3584fb114a1996fd8a (patch) | |
tree | 8f222a9775ce0ea9487029f8d0f50a690d2fd9fb /.gitignore | |
parent | 605c0b428406e58899bbac754a4c983332a8e0a0 (diff) | |
parent | b18e284adaf2c0fce848e85e4d8ce615db6b66ed (diff) |
Merge branch 'master' into dotnetcore-file-watcher
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index f4dc626079..367c96c9ee 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,7 @@ obj/ /main/packages /main/.nuget/ pull-package.exe +/main/tests/StressTest/TestProject/bin #VS writes these sometimes even when it doesn't change anything /main/_UpgradeReport_Files @@ -63,12 +64,15 @@ autom4te.cache/ tarballs/ test-results/ Thumbs.db +.vs #Mac bundle stuff *.dmg *.app /main/build/MacOSX/render.exe /main/build/MacOSX/*.o +/main/external/fsharpbinding/.paket +/main/external/fsharpbinding/paket-files /main/external/Xamarin.Mac.registrar.full.a /main/external/Xamarin.Mac.dll* /main/external/libxammac.dylib |