Merge branch 'master' of github.com:mitmproxy/mitmproxy

This commit is contained in:
Maximilian Hils 2014-02-17 00:15:58 +01:00
commit b5d02add28

View File

@ -1,4 +1,4 @@
IVERSION = (0, 10) IVERSION = (0, 11)
VERSION = ".".join(str(i) for i in IVERSION) VERSION = ".".join(str(i) for i in IVERSION)
NAME = "mitmproxy" NAME = "mitmproxy"
NAMEVERSION = NAME + " " + VERSION NAMEVERSION = NAME + " " + VERSION