aboutsummaryrefslogtreecommitdiffhomepage
path: root/python
diff options
context:
space:
mode:
authorGravatar Bo Yang <teboring@google.com>2017-07-17 09:36:22 -0700
committerGravatar Bo Yang <teboring@google.com>2017-07-18 11:06:16 -0700
commit6ec0b7e4d1fb606c6572a946e4eae97273367e67 (patch)
treed983812539a3299ff130fff469140bdcd1bb1690 /python
parent324b20a49170cb38d15ef243bc044026adb54ae1 (diff)
parent5532abc15b97f3489183b266b41844306052a3fa (diff)
Merge 3.3.x into master
Diffstat (limited to 'python')
-rwxr-xr-xpython/google/protobuf/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py
index 0375d72d..622dfb3d 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.3.0'
+__version__ = '3.3.2'
if __name__ != '__main__':
try: