aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore11
1 files changed, 11 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a2cb75fd..27eeb9c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,7 @@ python/.eggs/
python/.tox
python/build/
python/google/protobuf/compiler/
+python/google/protobuf/util/
src/protoc
src/unittest_proto_middleman
@@ -81,6 +82,7 @@ javanano/target
# Windows native output.
cmake/build
+build_msvc
# NuGet packages: we want the repository configuration, but not the
# packages themselves.
@@ -100,7 +102,16 @@ objectivec/ProtocolBuffers_iOS.xcodeproj/xcuserdata/
conformance/.libs/
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/google/
+conformance/javac_middleman
+conformance/lite/
conformance/protoc_middleman