diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2014-07-03 23:57:18 +0400 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2014-07-03 23:57:18 +0400 |
| commit | c4f7804fda12518d69c2db3766afcfecdfb5fdc2 (patch) | |
| tree | 216cb7f77dd746da92b9aaeb656a8eb1e6a2e253 /.gitignore | |
| parent | 3e79e5ea9b967926a5ae0709485f0b4cb596897f (diff) | |
| parent | 5d5dde2d5992f2b89ccc22c4cdce670d9ea6f07a (diff) | |
Merge branch 'aspnet-awesome'
Conflicts:
version-checks
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 63bab9e283..a83a4ae599 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ obj/ /main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/bin /main/src/core/MonoDevelop.Core/BuildVariables.cs /scripts/configure.exe +/main/packages #VS writes these sometimes even when it doesn't change anything /main/_UpgradeReport_Files @@ -49,6 +50,7 @@ autom4te.cache/ *.tar.gz tarballs/ test-results/ +Thumbs.db #Mac bundle stuff *.dmg @@ -76,7 +78,7 @@ test-results/ /main/man/Makefile /main/build/MacOSX/Makefile /main/build/Makefile -main/external/Makefile +/main/external/Makefile /main/contrib/Makefile /main/contrib/Mono.Cecil/Makefile /main/contrib/ICSharpCode.NRefactory.CSharp/Makefile @@ -85,8 +87,6 @@ main/external/Makefile /main/po/Makefile /main/src/Makefile /main/src/addins/AspNet/Makefile -/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Makefile -/main/src/addins/AspNet/MonoDevelop.AspNet/Makefile /main/src/addins/CBinding/Makefile /main/src/addins/CSharpBinding/AspNet/Makefile /main/src/addins/CSharpBinding/Autotools/Makefile @@ -122,7 +122,7 @@ main/external/Makefile /main/src/addins/MonoDevelop.RegexToolkit/Makefile /main/src/addins/MonoDevelop.SourceEditor2/Makefile /main/src/addins/MonoDevelop.WebReferences/Makefile -/main/src/addins/MonoDevelop.XmlEditor/Makefile +/main/src/addins/Xml/Makefile /main/src/addins/MonoDeveloperExtensions/Makefile /main/src/addins/MonoDeveloperExtensions/NUnit/Makefile /main/src/addins/NUnit/Makefile |