1
0
mirror of https://github.com/github/gitignore synced 2024-12-03 17:05:44 +01:00

Merge branch 'master' of github.com:ShonFrazier/gitignore

This commit is contained in:
Shon Frazier 2014-04-02 14:33:52 -04:00
commit 3085ba596e
3 changed files with 5 additions and 0 deletions

View File

@ -1,3 +1,4 @@
## Mac OS X
.DS_Store .DS_Store
.AppleDouble .AppleDouble
.LSOverride .LSOverride
@ -11,3 +12,4 @@ Icon
# Files that might appear on external disk # Files that might appear on external disk
.Spotlight-V100 .Spotlight-V100
.Trashes .Trashes

View File

@ -1,3 +1,4 @@
## Xcode
build/ build/
*.pbxuser *.pbxuser
!default.pbxuser !default.pbxuser

View File

@ -1,3 +1,5 @@
## See Global/Xcode.gitignore
# CocoaPods # CocoaPods
# #
# We recommend against adding the Pods directory to your .gitignore. However # We recommend against adding the Pods directory to your .gitignore. However