aboutsummaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorJisi Liu <jisi.liu@gmail.com>2016-09-14 09:37:48 -0700
committerJisi Liu <jisi.liu@gmail.com>2016-09-14 09:37:48 -0700
commit58860c021f0bdd0c79e612e7092c6c3d692488c0 (patch)
tree7c05b76a3b5573130daf2d0bf4e70359d87f02c1 /python
parent86fcd879b38505446799b2f2a2929415ddad620a (diff)
parent57170b93438b25c9c7da9bc53a9545dad261fbcb (diff)
downloadprotobuf-58860c021f0bdd0c79e612e7092c6c3d692488c0.tar.gz
protobuf-58860c021f0bdd0c79e612e7092c6c3d692488c0.tar.bz2
protobuf-58860c021f0bdd0c79e612e7092c6c3d692488c0.zip
Merge remote-tracking branch 'origin/3.0.x' into merge
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 6210a404..30ee6e81 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.0.0'
+__version__ = '3.0.2'
if __name__ != '__main__':
try: