Merge branch 'master' into hardfailvenv

Conflicts:
	dev
This commit is contained in:
Jim Shaver
2015-06-23 21:48:05 -05:00
206 changed files with 76105 additions and 16558 deletions

View File

@@ -2,8 +2,11 @@
set VENV=..\venv.mitmproxy
virtualenv %VENV%
if %errorlevel% neq 0 exit /b %errorlevel%
call %VENV%\Scripts\activate.bat
if %errorlevel% neq 0 exit /b %errorlevel%
pip install --src .. -r requirements.txt
if %errorlevel% neq 0 exit /b %errorlevel%
echo.
echo * Created virtualenv environment in %VENV%.