Luca Bruno 033605e87f Merge branch 'nixos-subdir' ... Conflicts: nixos/modules/system/boot/loader/grub/grub.nix		2015-06-13 15:18:12 +02:00
..
grub.nix	Merge branch 'nixos-subdir'	2015-06-13 15:18:12 +02:00
install-grub.pl	Merge branch 'nixos-subdir'	2015-06-13 15:18:12 +02:00
ipxe.nix
memtest.nix