Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates. ... Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix		2012-11-21 16:20:36 +01:00
..
default.nix	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
sharutils-4.11.1-cross-binary-mode-popen.patch	sharutils: making them crossbuild, thanks to a patch.	2012-11-08 19:38:24 +01:00