Luca Bruno 033605e87f Merge branch 'nixos-subdir' ...

Conflicts:
	nixos/modules/system/boot/loader/grub/grub.nix

2015-06-13 15:18:12 +02:00

..

generations-dir

…

generic-extlinux-compatible

…

grub

Merge branch 'nixos-subdir'

2015-06-13 15:18:12 +02:00

gummiboot

…

init-script

…

raspberrypi

…

efi.nix

…

loader.nix

…