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
..
fuppes
alsa.nix	Merge remote-tracking branch 'origin/master' into systemd	2012-09-28 11:35:27 -04:00
fuppes.nix
mpd.nix	Add mpd module	2011-12-05 01:51:05 +00:00
pulseaudio.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00