Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/tools/misc/binutils/default.nix pkgs/tools/package-management/disnix/default.nix pkgs/top-level/all-packages.nix		2013-07-08 10:48:05 +02:00
..
2.6	python: Remove --with-wctype-functions flag	2013-06-21 14:05:46 +02:00
2.7	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
3.3	Merge branch 'master' into x-updates	2013-04-11 23:31:33 +02:00
docs	pythonDocs: recurseIntoAttrs does not recurse, bypass problem	2013-03-13 13:16:03 +01:00
python-linkme-wrapper.nix	python-linkme-wrapper	2013-01-22 15:28:30 +01:00
python-linkme-wrapper.sh	python: fix linkme-wrapper	2013-02-15 06:14:58 +01:00
wrapper.nix	fix pythonWrapper for non-gnu ln	2013-03-25 15:13:08 +01:00