diff options
author | Sree Kuchibhotla <sreek@google.com> | 2015-10-22 10:38:22 -0700 |
---|---|---|
committer | Sree Kuchibhotla <sreek@google.com> | 2015-10-22 10:38:22 -0700 |
commit | 7f729f5ad86e8911fe6c4553da6becd1f0156560 (patch) | |
tree | b566c91d8a073db4446758ebeb353087f71b25e6 /.gitignore | |
parent | ac7edec71f2d4d076bc43bc5cef1abc44578a8fd (diff) | |
parent | 1bc8fa7bf712cb49f74198270dd6b2537f798434 (diff) |
Merge branch 'master' into stress_tests_new
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 8b976383a7..3606177655 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,31 @@ out # Core dump files core + +# XCode +build/ +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata +*.xccheckout +*.moved-aside +DerivedData +*.hmap +*.ipa +*.xcuserstate +*.DS_Store + +# Objective-C generated files +*.pbobjc.* +*.pbrpc.* + +# Cocoapods artifacts +# Podfile.lock and the workspace file are tracked, to ease deleting them. That's +# needed to trigger "pod install" to rerun the preinstall commands. +Pods/ |