diff options
| author | Michael Gerbush <michaelg@spiceworks.com> | 2013-11-07 13:04:32 -0600 |
|---|---|---|
| committer | Michael Gerbush <michaelg@spiceworks.com> | 2013-11-07 13:04:32 -0600 |
| commit | 95075cccba0e117228071667d908df497936b3fe (patch) | |
| tree | cb755766987970fd52de92236729cd6a5dc4b829 /Objective-C.gitignore | |
| parent | 182aeb220dc2ebffc4e22936b19deb50b071d4a2 (diff) | |
| parent | 7bbc288b527710d20cc68d7c114ddb8392f97d62 (diff) | |
| download | gitignore-95075cccba0e117228071667d908df497936b3fe.tar.gz gitignore-95075cccba0e117228071667d908df497936b3fe.zip | |
Merge branch 'master' into patch-1
Conflicts:
Objective-C.gitignore
Diffstat (limited to 'Objective-C.gitignore')
| -rw-r--r-- | Objective-C.gitignore | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 6a329198..8dcee63e 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -1,5 +1,7 @@ -# Xcode +# OS X .DS_Store + +# Xcode build/ *.pbxuser !default.pbxuser @@ -10,8 +12,13 @@ build/ *.perspectivev3 !default.perspectivev3 xcuserdata +*.xccheckout profile *.moved-aside DerivedData .idea/ *.hmap +*.xccheckout + +# CocoaPods +Pods |