diff options
| author |  Jisi Liu <liujisi@google.com> | 2014-11-25 15:12:24 -0800 |
|---|---|---|
| committer | Jisi Liu <liujisi@google.com> | 2014-11-25 15:12:24 -0800 |
| commit | 7d2db50b219b1f1358c12daa0309e657f654469e (patch) | |
| tree | 7fc42405ac118390c676774243f75511e29d5772 /python/google/protobuf/pyext/descriptor.cc | |
| parent | 6ae3bde73dd9090712e22986afe866229e61d305 (diff) | |
| parent | 241921c66671c845174e52cc20e00d25a0cc17a7 (diff) | |
Merge pull request #104 from pherl/master
Link Java Nano generator into protoc.
Diffstat (limited to 'python/google/protobuf/pyext/descriptor.cc')
0 files changed, 0 insertions, 0 deletions