aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorThomas Van Lenten <thomasvl@google.com>2016-05-06 11:44:42 -0400
committerThomas Van Lenten <thomasvl@google.com>2016-05-06 11:44:42 -0400
commitf367642103160b357cce6e59256cd3a51c9bad28 (patch)
tree0c56a6f053751522e70b77111ca1af0bd977efa9 /.gitignore
parent5b5e369b185325c49ee450965ceceb6ac5586b16 (diff)
downloadprotobuf-f367642103160b357cce6e59256cd3a51c9bad28.tar.gz
protobuf-f367642103160b357cce6e59256cd3a51c9bad28.tar.bz2
protobuf-f367642103160b357cce6e59256cd3a51c9bad28.zip
Add two missing ignores for conformance directory.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a2d6ca9c..27eeb9c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,5 +111,7 @@ conformance/conformance.pb.h
conformance/Conformance.pbobjc.h
conformance/Conformance.pbobjc.m
conformance/conformance.rb
+conformance/google/
conformance/javac_middleman
+conformance/lite/
conformance/protoc_middleman