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
..
2.0x.nix	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
buggybios.patch
default.nix
device-mapper-symlinks.patch
fix-bash-completion.patch	grub-2.0: fix bash completion script	2012-10-16 19:10:11 +02:00
symlink.patch