Merge pull request #163 from mibe/master

Some C# / VS changes
2011-09-01 16:55:11 -07:00 · 2011-09-01 16:55:11 -07:00 · c08b5eaf4a
parent d9fb955d92 9dd829c486
commit c08b5eaf4a
2 changed files with 2 additions and 5 deletions
--- 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
--- 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