Merge branch 'arm64Beta'

Conflicts: src/compiler/objc_helpers.cc
Serheo · Apr 30, 2014 · d2ee253 · d2ee253
2 parents cf1b2cb + cda3fe5
commit d2ee253
Show file tree

Hide file tree

Showing 83 changed files with 8,025 additions and 5,740 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,13 +27,23 @@ src/compiler/protoc-gen-objc-arc
 # Mac stuff
 .DS_Store
 
-# Xcode stuff
-Build/
+# Xcode
+.DS_Store
+build/
 *.pbxuser
-*.perspective
-*.perspectivev3
+!default.pbxuser
 *.mode1v3
+!default.mode1v3
 *.mode2v3
-*.xcuserdata
-*.xcuserdatad
-*.xccheckout
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+*.xcworkspace
+!default.xcworkspace
+xcuserdata
+profile
+*.moved-aside
+DerivedData
+.idea/
+
+
diff --git a/Example/Person.pb.h b/Example/Person.pb.h