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

2024-12-03 17:05:44 +01:00 · 2014-04-02 14:33:52 -04:00 · 2014-04-02 14:33:52 -04:00 · 3085ba596e
commit 3085ba596e
parent 25ceefa81e 28f5dd4bff
3 changed files with 5 additions and 0 deletions
--- a/Global/OSX.gitignore
+++ b/Global/OSX.gitignore
@ -1,3 +1,4 @@
+## Mac OS X
 .DS_Store
 .AppleDouble
 .LSOverride
@ -11,3 +12,4 @@ Icon
 # Files that might appear on external disk
 .Spotlight-V100
 .Trashes
+
--- a/Global/Xcode.gitignore
+++ b/Global/Xcode.gitignore
@ -1,3 +1,4 @@
+## Xcode
 build/
 *.pbxuser
 !default.pbxuser
--- a/Objective-C.gitignore
+++ b/Objective-C.gitignore
@ -1,3 +1,5 @@
+## See Global/Xcode.gitignore
+
 # CocoaPods
 #
 # We recommend against adding the Pods directory to your .gitignore. However