Merge branch 'master' into patch-1

Conflicts: Objective-C.gitignore
2013-11-07 13:04:32 -06:00
parent 182aeb220d 7bbc288b52
commit 95075cccba
62 changed files with 277 additions and 95 deletions
--- 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