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

de22561b · Dan O'Reilly · 3bdfb4b6 · 4fefc07e · de22561b
Commit de22561b authored Aug 20, 2015 by Dan O'Reilly
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

.gitignore .gitignore +0 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -51,7 +51,6 @@ src/google/protobuf/util/**/*.pb.cc
 src/google/protobuf/util/**/*.pb.h

 *.pyc
-*.so
 *.egg-info
 *_pb2.py
 python/*.egg