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
..
default.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
gnome.nix
kde4.nix	Fix KDE/kdm	2012-08-20 11:10:19 -04:00
none.nix
xfce.nix	Drop xfce-4.6 compatibility	2012-09-21 11:03:07 -04:00
xterm.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00