aboutsummaryrefslogtreecommitdiffstats
path: root/netlib
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2016-06-12 11:27:16 +1200
committerGitHub <noreply@github.com>2016-06-12 11:27:16 +1200
commite58a2bf0956c6916ebba2477df0320b554c139e2 (patch)
tree83934cad2a5918fd7b22a7236985356dfc9cced3 /netlib
parentdc545ca0f63b63c88dd5bf5d072a3d9b5cc2a2ea (diff)
parent1d4403096393369e0a8038ad79434ac26b503de3 (diff)
downloadmitmproxy-e58a2bf0956c6916ebba2477df0320b554c139e2.tar.gz
mitmproxy-e58a2bf0956c6916ebba2477df0320b554c139e2.tar.bz2
mitmproxy-e58a2bf0956c6916ebba2477df0320b554c139e2.zip
Merge branch 'master' into appveyor
Diffstat (limited to 'netlib')
-rw-r--r--netlib/version.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/netlib/version.py b/netlib/version.py
index 94ea43ba..a048c17f 100644
--- a/netlib/version.py
+++ b/netlib/version.py
@@ -2,5 +2,5 @@ from __future__ import (absolute_import, print_function, division)
IVERSION = (0, 18)
VERSION = ".".join(str(i) for i in IVERSION)
-NAME = "netlib"
-NAMEVERSION = NAME + " " + VERSION
+PATHOD = "pathod " + VERSION
+MITMPROXY = "mitmproxy " + VERSION