Skip to content

Commit

Permalink
Merge pull request github#163 from mibe/master
Browse files Browse the repository at this point in the history
Some C# / VS changes
  • Loading branch information
defunkt committed Sep 1, 2011
2 parents d9fb955 + 9dd829c commit c08b5ea
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 0 additions & 3 deletions 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) # Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
bin bin
obj obj
Expand Down
4 changes: 2 additions & 2 deletions Global/VisualStudio.gitignore
Expand Up @@ -69,5 +69,5 @@ Generated_Code #added for RIA/Silverlight projects
# Backup & report files from converting an old project file to a newer # Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-) # Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/ _UpgradeReport_Files/
Backup/ Backup*/
UpgradeLog.XML UpgradeLog*.XML

0 comments on commit c08b5ea

Please sign in to comment.