diff options
author | Tres Seaver <tseaver@palladion.com> | 2015-01-13 15:56:19 -0500 |
---|---|---|
committer | Tres Seaver <tseaver@palladion.com> | 2015-01-13 15:56:19 -0500 |
commit | 105cc0e0fc54aa5382c581ff8f55e584f24d0faa (patch) | |
tree | 63ecc96b4826577c8faa90ca146b782b95986649 | |
parent | a2abc947c0d509354e61e321215989829a68794e (diff) | |
parent | 58dbea9944dfa16d3bd2f73560c47a97062d51bf (diff) | |
download | protobuf-105cc0e0fc54aa5382c581ff8f55e584f24d0faa.tar.gz protobuf-105cc0e0fc54aa5382c581ff8f55e584f24d0faa.tar.bz2 protobuf-105cc0e0fc54aa5382c581ff8f55e584f24d0faa.zip |
Merge branch 'ignore_so_libs' into straddle_py2_py3
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -61,3 +61,4 @@ src/test_plugin src/testzip.* src/zcg*zip ar-lib +*.so |