aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPaul Yang <TeBoring@users.noreply.github.com>2015-11-05 06:11:12 -0800
committerPaul Yang <TeBoring@users.noreply.github.com>2015-11-05 06:11:12 -0800
commita030cc750ce26bbfa3e7f4fed3b24de19fba4127 (patch)
tree325a869f9b21cee01df3acbac1ee75eeb8becade /.gitignore
parentb6a32e909b1f58f157c19276af233e44627093f4 (diff)
parentf0411ec9745a50d123f68a7c7468d71afae9e2c2 (diff)
downloadprotobuf-a030cc750ce26bbfa3e7f4fed3b24de19fba4127.tar.gz
protobuf-a030cc750ce26bbfa3e7f4fed3b24de19fba4127.tar.bz2
protobuf-a030cc750ce26bbfa3e7f4fed3b24de19fba4127.zip
Merge pull request #943 from thomasvl/conformance
Update the Mac build script to include the conformance tests
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 46487128..a9b0a885 100644
--- a/.gitignore
+++ b/.gitignore
@@ -104,4 +104,5 @@ conformance/conformance-cpp
conformance/conformance-test-runner
conformance/conformance.pb.cc
conformance/conformance.pb.h
+conformance/conformance.rb
conformance/protoc_middleman