diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:14:42 -0700 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:14:42 -0700 |
commit | a8465b738e5a1f346ece58ea6f82612bcd6659d2 (patch) | |
tree | b755540a5d7d2cc988eabc7ac594e6abd9da29d1 /.gitignore | |
parent | 6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3 (diff) | |
parent | 9bbc4b1fab8262958c172f2d8e87b486c950a051 (diff) | |
download | protobuf-a8465b738e5a1f346ece58ea6f82612bcd6659d2.tar.gz protobuf-a8465b738e5a1f346ece58ea6f82612bcd6659d2.tar.bz2 protobuf-a8465b738e5a1f346ece58ea6f82612bcd6659d2.zip |
Merge master branch.
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -53,7 +53,7 @@ src/google/protobuf/util/**/*.pb.h *.pyc *.egg-info *_pb2.py -python/*.egg +python/**/*.egg python/.eggs/ python/.tox python/build/ @@ -186,3 +186,6 @@ cmake/cmake-build-debug/ # Common build subdirectories. ./.build/ ./_build/ + +# Visual Studio 2017 +.vs |