aboutsummaryrefslogtreecommitdiff
path: root/python/setup.py
diff options
context:
space:
mode:
authorJisi Liu <jisi.liu@gmail.com>2018-01-03 09:28:40 -0800
committerJisi Liu <jisi.liu@gmail.com>2018-01-03 09:28:40 -0800
commit383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a (patch)
tree45bdce007f64e47ff2a0b60fb1920efc3eaf3b00 /python/setup.py
parent8529f2aee33ae793c9ce362a45370b98f675370a (diff)
parent88e5573b9a8a5c4038f9db3633610f032aab277d (diff)
downloadprotobuf-383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a.tar.gz
protobuf-383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a.tar.bz2
protobuf-383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a.zip
Merge remote-tracking branch 'origin/3.5.x' into master
Diffstat (limited to 'python/setup.py')
-rwxr-xr-xpython/setup.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/python/setup.py b/python/setup.py
index efb74fe7..0f7e58b0 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -240,7 +240,6 @@ if __name__ == '__main__':
classifiers=[
"Programming Language :: Python",
"Programming Language :: Python :: 2",
- "Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.3",