Merge pull request #163 from mibe/master

defunkt · defunkt · commit c08b5eaf4af0 · 2011-09-01T16:55:11.000-07:00
Some C# / VS changes
diff --git a/CSharp.gitignore b/CSharp.gitignore
@@ -1,6 +1,3 @@
-# ReSharper meta directory
-_ReSharper*
-
 # Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
 bin
 obj
diff --git a/Global/VisualStudio.gitignore b/Global/VisualStudio.gitignore
@@ -69,5 +69,5 @@ 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
+Backup*/
+UpgradeLog*.XML
