Eelco Dolstra 3ad370ae0a Merge remote-tracking branch 'origin/master' into systemd ... Conflicts: modules/misc/ids.nix modules/services/mail/postfix.nix modules/services/system/nscd.nix modules/services/x11/desktop-managers/xfce.nix modules/system/boot/stage-1.nix		2012-09-28 11:35:27 -04:00
..
config	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-08-20 11:27:38 -04:00
hardware	Add new 'hardware.cpu.amd.updateMicrocode' option.	2012-09-11 18:44:37 +02:00
installer	nixos-rebuild: Support --option	2012-09-14 13:23:19 -04:00
misc	Merge remote-tracking branch 'origin/master' into systemd	2012-09-28 11:35:27 -04:00
profiles	Remove jfsrec from the minimal CD because it pulls in Boost	2012-07-25 11:39:41 -04:00
programs	Fix the dependencies of the vboxnet0 service	2012-08-20 16:19:57 -04:00
security	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-08-20 11:27:38 -04:00
services	Merge remote-tracking branch 'origin/master' into systemd	2012-09-28 11:35:27 -04:00
system	Merge remote-tracking branch 'origin/master' into systemd	2012-09-28 11:35:27 -04:00
tasks	Merge remote-tracking branch 'origin/master' into systemd	2012-09-28 11:35:27 -04:00
testing	Automatically append ".service" to the name of service units	2012-08-23 10:25:27 -04:00
virtualisation	Automatically append ".service" to the name of service units	2012-08-23 10:25:27 -04:00
module-list.nix	Merge remote-tracking branch 'origin/master' into systemd	2012-09-28 11:35:27 -04:00
rename.nix	Adding a rename line for rt73 -> ralink.	2012-08-11 14:54:43 +02:00