Merge pull request #163 from mibe/master

Some C# / VS changes

Merge pull request #163 from mibe/master
Some C# / VS changes
c08b5eaf · Chris Wanstrath · d9fb955d · 9dd829c4 · c08b5eaf · c08b5eaf
Commit c08b5eaf authored Sep 01, 2011 by Chris Wanstrath
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

CSharp.gitignore CSharp.gitignore +0 -3

VisualStudio.gitignore Global/VisualStudio.gitignore +2 -2

No files found.
--- a/CSharp.gitignore
+++ b/CSharp.gitignore
-# ReSharper meta directory
-_ReSharper*
-
 # Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
 bin
 obj

--- 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