Merge branch 'py2_py3_straddle' of github.com:dano/protobuf into py2_py3_straddle

This commit is contained in:
Dan O'Reilly 2015-08-20 13:57:03 -04:00
commit de22561b7b

1
.gitignore vendored
View file

@ -51,7 +51,6 @@ src/google/protobuf/util/**/*.pb.cc
src/google/protobuf/util/**/*.pb.h
*.pyc
*.so
*.egg-info
*_pb2.py
python/*.egg