commit 1745f7eae9bc206ffeb47d63dcdfa039ef3774e8
author Thomas Van Lenten <thomasvl@google.com> Tue Nov 17 10:18:49 2015 -0500
committer Thomas Van Lenten <thomasvl@google.com> Wed Nov 18 11:58:19 2015 -0500
tree 94c3b61e4b025c453c949c45255c5681914c799b
parent 8162451b727e5abd46ea934a81d44c6ff7e0963e

Add support for the conformance test for objc when run on OS X

.gitignore

diff --git a/.gitignore b/.gitignore
index b0a92f8..19e5212 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,9 +103,12 @@
 conformance/conformance-cpp
 conformance/conformance-csharp
 conformance/conformance-java
+conformance/conformance-objc
 conformance/conformance-test-runner
 conformance/conformance.pb.cc
 conformance/conformance.pb.h
+conformance/Conformance.pbobjc.h
+conformance/Conformance.pbobjc.m
 conformance/conformance.rb
 conformance/javac_middleman
 conformance/protoc_middleman