diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-02-18 11:27:40 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-02-18 11:27:40 +0100 |
| commit | bf024cd15320119e341cdf9bf0fd4d69df233c64 (patch) | |
| tree | 05a6338d94c665421ae1eab07f14aed61b8bd2b1 /release | |
| parent | f42af9061220ec0373e94e96b69434575f60281d (diff) | |
| parent | 31ab3a231e540815009ffe5aeae108db2babd8a9 (diff) | |
| download | mitmproxy-bf024cd15320119e341cdf9bf0fd4d69df233c64.tar.gz mitmproxy-bf024cd15320119e341cdf9bf0fd4d69df233c64.tar.bz2 mitmproxy-bf024cd15320119e341cdf9bf0fd4d69df233c64.zip | |
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
Diffstat (limited to 'release')
| -rw-r--r-- | release/.gitignore | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | release/rtool.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/release/.gitignore b/release/.gitignore new file mode 100644 index 00000000..2247d5f9 --- /dev/null +++ b/release/.gitignore @@ -0,0 +1,2 @@ +/build +/dist diff --git a/release/rtool.py b/release/rtool.py index 2ebb3a1c..d01ee741 100644..100755 --- a/release/rtool.py +++ b/release/rtool.py @@ -250,7 +250,7 @@ def bdist(ctx, use_existing_wheels, pyinstaller_version): "--clean", "--workpath", PYINSTALLER_TEMP, "--distpath", PYINSTALLER_DIST, - # This is PyInstaller, so setting a + # This is PyInstaller, so setting a # different log level obviously breaks it :-) # "--log-level", "WARN", spec |