Vladimír Čunát 6c2fbfbd77 Merge branch 'master' into staging		2016-05-12 04:53:38 +02:00
..
catch_conflicts.py	buildPythonPackage: catch_conflicts should ignore pip	2015-11-21 21:44:12 +01:00
default.nix	Python: re-enable default testing	2016-05-09 18:33:43 +02:00
run_setup.py	buildPythonPackage: use a separate file to fire off setup.py	2015-11-21 21:44:12 +01:00
wrap.sh	wrapPython: drop python suffixes	2016-04-22 20:57:15 +03:00