aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorThomas Van Lenten <thomasvl@google.com>2015-11-17 10:18:49 -0500
committerThomas Van Lenten <thomasvl@google.com>2015-11-18 11:58:19 -0500
commit1745f7eae9bc206ffeb47d63dcdfa039ef3774e8 (patch)
tree94c3b61e4b025c453c949c45255c5681914c799b /.gitignore
parent8162451b727e5abd46ea934a81d44c6ff7e0963e (diff)
downloadprotobuf-1745f7eae9bc206ffeb47d63dcdfa039ef3774e8.tar.gz
protobuf-1745f7eae9bc206ffeb47d63dcdfa039ef3774e8.tar.bz2
protobuf-1745f7eae9bc206ffeb47d63dcdfa039ef3774e8.zip
Add support for the conformance test for objc when run on OS X
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index b0a92f82..19e52129 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,9 +103,12 @@ conformance/com/
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