diff options
| author | Dan O'Reilly <oreilldf@gmail.com> | 2015-08-20 13:57:03 -0400 |
|---|---|---|
| committer | Dan O'Reilly <oreilldf@gmail.com> | 2015-08-20 13:57:03 -0400 |
| commit | de22561b7b34dcf68bdf09a52df3959bed697c14 (patch) | |
| tree | 0d32cd83c186a7138f75d6c56cad9a02e7681eca | |
| parent | 3bdfb4b6951ad3db1a9493e86cd76f4f1c4d8986 (diff) | |
| parent | 4fefc07ec546222b4afd27e43d2085dd76ac0373 (diff) | |
| download | protobuf-de22561b7b34dcf68bdf09a52df3959bed697c14.tar.gz protobuf-de22561b7b34dcf68bdf09a52df3959bed697c14.tar.bz2 protobuf-de22561b7b34dcf68bdf09a52df3959bed697c14.zip | |
Merge branch 'py2_py3_straddle' of github.com:dano/protobuf into py2_py3_straddle
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -51,7 +51,6 @@ src/google/protobuf/util/**/*.pb.cc src/google/protobuf/util/**/*.pb.h *.pyc -*.so *.egg-info *_pb2.py python/*.egg |