aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorThomas Van Lenten <thomasvl@google.com>2015-11-16 11:24:58 -0500
committerThomas Van Lenten <thomasvl@google.com>2015-11-16 11:29:59 -0500
commit42f2eee932fe595671bc9d9eb0680038b03cdfe3 (patch)
treebbdc7211194132a15cb23f20c406687155ec6bcd /.gitignore
parent8b31d7410aabefc2e93f85e13f44846ddfa0f135 (diff)
downloadprotobuf-42f2eee932fe595671bc9d9eb0680038b03cdfe3.tar.gz
protobuf-42f2eee932fe595671bc9d9eb0680038b03cdfe3.tar.bz2
protobuf-42f2eee932fe595671bc9d9eb0680038b03cdfe3.zip
Cleanups of deps and ignores for conformance
- Hopefully complete the deps for other languages for the generated conformance proto sources. - List the generated sources for cleanup by make's clean rules. - Make the toplevel nuke the pyc files that can get created in the ObjC dir.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a9b0a885..b0a92f82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,8 +101,11 @@ objectivec/ProtocolBuffers_iOS.xcodeproj/xcuserdata/
conformance/.libs/
conformance/com/
conformance/conformance-cpp
+conformance/conformance-csharp
+conformance/conformance-java
conformance/conformance-test-runner
conformance/conformance.pb.cc
conformance/conformance.pb.h
conformance/conformance.rb
+conformance/javac_middleman
conformance/protoc_middleman