diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
| commit | 080e4534253338c94e6d8c86cb3679ff15410f85 (patch) | |
| tree | 6322fb822332b4135f0ff14de8c2d7137016f734 /libmproxy/contrib/README | |
| parent | db5c0b210b0133d7cd58124c727dbc24480e2568 (diff) | |
| parent | 074d8d7c7463cdb1f0a90e165a4b3ada3554b4c2 (diff) | |
| download | mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.gz mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.bz2 mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.zip | |
Merge branch 'master' into hardfailvenv
Conflicts:
dev
Diffstat (limited to 'libmproxy/contrib/README')
| -rw-r--r-- | libmproxy/contrib/README | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libmproxy/contrib/README b/libmproxy/contrib/README index 656df3dd..3b0f7512 100644 --- a/libmproxy/contrib/README +++ b/libmproxy/contrib/README @@ -1,14 +1,10 @@ Contribs: - -pyparsing 1.5.2, MIT license - jsbeautifier, git checkout 25/03/12, MIT license - Removed test directories - Disabled packers through a single-line modification (see "# CORTESI" comment) -html2text, git checkout 18/08/12, GPLv3 - -WinDivert 1.1.4, LGPL license, http://reqrypt.org/windivert.html
\ No newline at end of file +wbxml + - https://github.com/davidpshaw/PyWBXMLDecoder |