Merged pull request github#135 from mibe/master.

More VisualStudio rules
d2s · Apr 29, 2011 · f6dfb71 · f6dfb71
2 parents 4ee2a35 + 697559b
commit f6dfb71
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/CSharp.gitignore b/CSharp.gitignore
@@ -5,12 +5,5 @@ _ReSharper*
 bin
 obj
 
-# user settings
-*.user
-*.suo
-
-# if you have pictures, windows will likely create those annoying index files
-Thumbs.db
-
 # mstest test results
 TestResults
diff --git a/Global/VisualStudio.gitignore b/Global/VisualStudio.gitignore
@@ -64,3 +64,9 @@ stylecop.*
 ~$*
 *.dbmdl
 Generated_Code #added for RIA/Silverlight projects
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup/
+UpgradeLog.XML