aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorCH Albach <calbach@google.com>2016-01-29 18:10:50 -0800
committerCH Albach <calbach@google.com>2016-01-29 18:10:50 -0800
commit5477f8cdbab0103beba17fc90ae8730835ea427f (patch)
tree21862e6f659d5868f91aaebb066b5b20aa42819f /.gitignore
parentb13874d59e976371a1a87e6dc2bf347ed0a0ce5d (diff)
downloadprotobuf-5477f8cdbab0103beba17fc90ae8730835ea427f.tar.gz
protobuf-5477f8cdbab0103beba17fc90ae8730835ea427f.tar.bz2
protobuf-5477f8cdbab0103beba17fc90ae8730835ea427f.zip
Manually down-integrate python JSON struct support from internal code base.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 19e52129..a2d6ca9c 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