aboutsummaryrefslogtreecommitdiffhomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorGravatar Thomas Van Lenten <thomasvl@google.com>2015-11-04 15:10:49 -0500
committerGravatar Thomas Van Lenten <thomasvl@google.com>2015-11-04 15:14:54 -0500
commitf0411ec9745a50d123f68a7c7468d71afae9e2c2 (patch)
tree325a869f9b21cee01df3acbac1ee75eeb8becade /.gitignore
parentb6a32e909b1f58f157c19276af233e44627093f4 (diff)
Update the Mac build script to include the conformance tests
- Kick off the conformance tests - Add missing ignore for something generated by a build on the conformance directory.
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