9 Commits

Author	SHA1	Message	Date
Maximilian Hils	95cef3c0e9	merge metadata files	2016-02-15 15:43:59 +01:00
Maximilian Hils	33fa49277a	move mitmproxy	2016-02-15 14:58:46 +01:00
Maximilian Hils	85f977aacd	dev script: fix Windows+vagrant+virtualenv	2015-08-07 14:45:48 +02:00
Jim Shaver	080e453425	Merge branch 'master' into hardfailvenv ... Conflicts: dev	2015-06-23 21:48:05 -05:00
Jim Shaver	854dc004ee	revert change, already done on master.	2015-06-23 20:47:36 -05:00
Jim Shaver	951fe2f7ed	Add a check to see if virtualenv is installed.	2015-06-23 20:17:57 -05:00
Maximilian Hils	cbf6cad852	make dev script more robust, fix #556	2015-04-13 17:17:18 +02:00
Maximilian Hils	e9a5a26bf0	./dev: echo what we have done	2015-03-14 03:08:34 +01:00
Maximilian Hils	f815525f18	simplify virtualenv ... - add dev.bat for Windows users - remove ~/.pipcache creation. If that causes issues with PyInstaller, we should use pip --no-cache-dir there or rm -r pip.locations.USER_CACHE_DIR. - remove superfluous pip install calls.	2015-03-14 02:33:21 +01:00