Michael Raskin
94205f5f21
Revert "Merge pull request #2449 from wkennington/master.grub"
...
This reverts commit 469f22d717e53c48d13a66ca862942e8098accc5, reversing
changes made to 0078bc5d8f87512104902eab00c8a44bef286067.
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
..
2014-02-08 21:10:00 +01:00
2014-06-28 16:05:47 +02:00
2014-08-30 07:33:38 -07:00
2014-06-28 16:05:47 +02:00
2014-07-29 15:34:22 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-08-31 12:58:37 +04:00
2014-08-10 14:51:23 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-04-14 21:03:43 +02:00
2014-07-30 13:18:33 +02:00
2013-10-10 13:28:20 +02:00
2014-06-28 16:05:47 +02:00
2014-07-02 11:28:43 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-08-30 07:33:38 -07:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-04-14 14:02:44 +02:00
2014-07-01 16:28:34 +02:00
2014-06-28 16:05:47 +02:00
2013-10-10 13:28:20 +02:00
2013-10-10 13:28:20 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00