| commit | 5477f8cdbab0103beba17fc90ae8730835ea427f | [log] [tgz] |
|---|---|---|
| author | CH Albach <calbach@google.com> | Fri Jan 29 18:10:50 2016 -0800 |
| committer | CH Albach <calbach@google.com> | Fri Jan 29 18:10:50 2016 -0800 |
| tree | 21862e6f659d5868f91aaebb066b5b20aa42819f | |
| parent | b13874d59e976371a1a87e6dc2bf347ed0a0ce5d [diff] [blame] |
Manually down-integrate python JSON struct support from internal code base.
diff --git a/.gitignore b/.gitignore index 19e5212..a2d6ca9 100644 --- a/.gitignore +++ b/.gitignore
@@ -58,6 +58,7 @@ python/.tox python/build/ python/google/protobuf/compiler/ +python/google/protobuf/util/ src/protoc src/unittest_proto_middleman