Luca Bruno 033605e87f Merge branch 'nixos-subdir' ... Conflicts: nixos/modules/system/boot/loader/grub/grub.nix		2015-06-13 15:18:12 +02:00
..
activation	Add option ‘system.extraDependencies’ for including stuff in the system closure	2015-06-04 11:06:44 +02:00
boot	Merge branch 'nixos-subdir'	2015-06-13 15:18:12 +02:00
etc	setup-etc.pl: Fail when symlink/rename fails	2014-10-06 08:00:11 +02:00
upstart	upstart: Oneshot rules should always have Restart=no	2014-04-16 01:04:52 +02:00