aboutsummaryrefslogtreecommitdiff
path: root/python/setup.py
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2014-10-21 16:36:59 -0700
committerFeng Xiao <xfxyjwf@gmail.com>2014-10-21 16:36:59 -0700
commitf9e623b1671c8333247f251c5c4a2ef2ad7bcb2d (patch)
treebaaba8a2cbfbe263870769401b3ca52dd5e36da2 /python/setup.py
parent2853cd4a10febda5ba7407e2e8570eae411761a6 (diff)
parentbba83652e1be610bdb7ee1566ad18346d98b843c (diff)
downloadprotobuf-f9e623b1671c8333247f251c5c4a2ef2ad7bcb2d.tar.gz
protobuf-f9e623b1671c8333247f251c5c4a2ef2ad7bcb2d.tar.bz2
protobuf-f9e623b1671c8333247f251c5c4a2ef2ad7bcb2d.zip
Merge changes from 2.6.1 release branch.
Diffstat (limited to 'python/setup.py')
-rwxr-xr-xpython/setup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/setup.py b/python/setup.py
index 91565c18..2450a774 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -156,7 +156,7 @@ if __name__ == '__main__':
))
setup(name = 'protobuf',
- version = '2.6.1rc1',
+ version = '2.6.1',
packages = [ 'google' ],
namespace_packages = [ 'google' ],
test_suite = 'setup.MakeTestSuite',