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
..
cgroups.nix	Use /sys/fs/cgroup instead of /dev/cgroup	2012-07-30 13:49:18 -04:00
dbus.nix	dbus.nix: Fix path to dbus-send	2012-07-20 17:38:36 -04:00
kerberos.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
nscd.conf	* Continued refactoring the tree: moved most Upstart jobs (namely	2009-05-24 23:13:23 +00:00
nscd.nix	Merge remote-tracking branch 'origin/master' into systemd	2012-09-28 11:35:27 -04:00
uptimed.nix	* Use boot.kernelModules everywhere instead of explicit calls to	2012-03-17 17:26:17 +00:00