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
..
amqp	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
audio	Merge remote-tracking branch 'origin/master' into systemd	2012-09-28 11:35:27 -04:00
backup	* Drop references to activation scriptlets that no longer exist.	2012-03-15 14:21:17 +00:00
databases	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-08-20 11:27:38 -04:00
games	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
hardware	Enable upower's systemd unit	2012-08-21 11:29:59 -04:00
logging	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-09-11 10:58:57 -04:00
mail	Merge remote-tracking branch 'origin/master' into systemd	2012-09-28 11:35:27 -04:00
misc	Move setting ownership of /nix/store to stage-2-init	2012-09-28 10:59:58 -04:00
monitoring	Merge remote-tracking branch 'origin/master' into systemd	2012-09-28 11:35:27 -04:00
network-filesystems	Global replace /var/run/current-system -> /run/current-system	2012-07-16 11:34:21 -04:00
networking	Merge remote-tracking branch 'origin/master' into systemd	2012-09-28 11:35:27 -04:00
printing	* CUPS: fix printing on a Ricoh Aficio MP C4500 PXL printer (and	2012-05-25 15:51:33 +00:00
scheduling	Global replace /var/run/current-system -> /run/current-system	2012-07-16 11:34:21 -04:00
security	F-Prot virus signaure database updater: package	2012-07-24 10:52:04 +03:00
system	Merge remote-tracking branch 'origin/master' into systemd	2012-09-28 11:35:27 -04:00
ttys	Don't restart agetty	2012-08-23 11:13:33 -04:00
web-servers	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-08-20 11:27:38 -04:00
x11	Merge remote-tracking branch 'origin/master' into systemd	2012-09-28 11:35:27 -04:00