diff options
author | Tres Seaver <tseaver@palladion.com> | 2015-01-13 15:59:09 -0500 |
---|---|---|
committer | Tres Seaver <tseaver@palladion.com> | 2015-01-13 15:59:09 -0500 |
commit | 11de4197737d310ab59048c2f7162e4dce96c1a4 (patch) | |
tree | 9c3d7e6e4ea6efb4ece872115b5f3052e3c98c36 /python/google/protobuf/internal/descriptor_database_test.py | |
parent | c0f673d0dcb07fd580144a2c74cb50086f4b746d (diff) | |
parent | e17f78bbbf16bc318a9aa8776a100271936efb43 (diff) | |
download | protobuf-11de4197737d310ab59048c2f7162e4dce96c1a4.tar.gz protobuf-11de4197737d310ab59048c2f7162e4dce96c1a4.tar.bz2 protobuf-11de4197737d310ab59048c2f7162e4dce96c1a4.zip |
Merge branch 'python-update_setup' into straddle_py2_py3
Diffstat (limited to 'python/google/protobuf/internal/descriptor_database_test.py')
0 files changed, 0 insertions, 0 deletions