From c93174346149f259ebc85fdb46826fcf84abb07d Mon Sep 17 00:00:00 2001 From: Paul Yang Date: Mon, 2 Apr 2018 15:55:28 -0700 Subject: 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 --- python/google/protobuf/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'python/google') 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: -- cgit v1.2.3