Michael Raskin 94205f5f21 Revert "Merge pull request #2449 from wkennington/master.grub" ... This reverts commit 469f22d717, reversing changes made to 0078bc5d8f. Conflicts: nixos/modules/installer/tools/nixos-generate-config.pl nixos/modules/system/boot/loader/grub/install-grub.pl nixos/release.nix nixos/tests/installer.nix I tried to keep apparently-safe code in conflicts.		2014-08-31 12:58:37 +04:00
..
grub.nix	Revert "Merge pull request #2449 from wkennington/master.grub"	2014-08-31 12:58:37 +04:00
install-grub.pl	Revert "Merge pull request #2449 from wkennington/master.grub"	2014-08-31 12:58:37 +04:00
memtest.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
winkler-gnu-blue-640x480.png	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
winkler-gnu-blue.README	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00