diff options
| author |  Paul Yang <TeBoring@users.noreply.github.com> | 2018-04-02 15:55:28 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-04-02 15:55:28 -0700 |
| commit | c93174346149f259ebc85fdb46826fcf84abb07d (patch) | |
| tree | 284fd957f2007db39101adb0d51ca0fb0b007255 /python/google | |
| parent | 579f81e1c66d64395031a1bbcb54ba7a44dade55 (diff) | |
Merge branch (#4466)
* Fix setup.py for windows build.
* Bump version number to 3.5.2
* Cat the test-suite.log on errors for presubits
Diffstat (limited to 'python/google')
| -rwxr-xr-x | python/google/protobuf/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 950f9b2d..d4360727 100755 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -30,7 +30,7 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '3.5.1' +__version__ = '3.5.2' if __name__ != '__main__': try: |