diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2016-03-30 11:43:44 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-03-30 11:43:44 -0700 |
| commit | 0de06f54bc8253ba39eee9e8cc4c5de487a48835 (patch) | |
| tree | e66dec08e23df554f5c29a1dbb4592388815e4ec /python | |
| parent | 3b3c8abb9635eb3ea078a821a99c9ef29d66dff7 (diff) | |
| parent | a25e9964b126a79e8a99bced2207ddca22d6a1a9 (diff) | |
Merge branch 'master' of github.com:google/protobuf
Diffstat (limited to 'python')
| -rwxr-xr-x | python/google/protobuf/__init__.py | 2 | ||||
| -rwxr-xr-x | python/setup.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 5d244191..fcb1734e 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.0b2' +__version__ = '3.0.0b2.post2' if __name__ != '__main__': try: diff --git a/python/setup.py b/python/setup.py index 24ac53db..6ea3bad7 100755 --- a/python/setup.py +++ b/python/setup.py @@ -210,6 +210,7 @@ if __name__ == '__main__': "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", ], + namespace_packages=['google'], packages=find_packages( exclude=[ 'import_test_package', |