Eelco Dolstra 44d091674b Merge branch 'master' of github.com:NixOS/nixos into systemd ... Conflicts: modules/config/networking.nix modules/services/networking/ssh/sshd.nix modules/services/ttys/agetty.nix modules/system/boot/stage-2-init.sh modules/system/upstart-events/shutdown.nix		2012-07-16 17:27:11 -04:00
..
desktop-managers
display-managers	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-07-16 17:27:11 -04:00
hardware
window-managers
terminal-server.nix
xfs.conf
xfs.nix
xserver.nix	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-07-16 17:27:11 -04:00