diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-10 20:56:13 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-10 20:56:13 -0800 |
| commit | 52909485d15a9ac617bc8948c02dafd1ab4233bd (patch) | |
| tree | b0d60d94523b828c077bfe47f30ce0e70c01f267 /python | |
| parent | 261fe97a63316a4a4918afcaa6c8c0f4b0da45fc (diff) | |
| parent | 8d5d7cc6d03b00fcb7162525100fbd4cc0d1929d (diff) | |
| download | protobuf-52909485d15a9ac617bc8948c02dafd1ab4233bd.tar.gz protobuf-52909485d15a9ac617bc8948c02dafd1ab4233bd.tar.bz2 protobuf-52909485d15a9ac617bc8948c02dafd1ab4233bd.zip | |
Merge branch v3.0.0-alpha-1 into master.
Conflicts:
configure.ac
Diffstat (limited to 'python')
| -rwxr-xr-x | python/setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/setup.py b/python/setup.py index 69ffcd1d..e4120208 100755 --- a/python/setup.py +++ b/python/setup.py @@ -163,7 +163,7 @@ if __name__ == '__main__': )) setup(name = 'protobuf', - version = '2.6.2-pre', + version = '3.0.0-alpha-1', packages = [ 'google' ], namespace_packages = [ 'google' ], test_suite = 'setup.MakeTestSuite', |