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
..
fonts.nix
gnu.nix
i18n.nix
krb5.nix
ldap.nix
networking.nix	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-07-16 17:27:11 -04:00
no-x-libs.nix
nsswitch-mdns.conf
nsswitch.conf
nsswitch.nix
power-management.nix
pulseaudio.nix
shells.nix	Global replace /var/run/current-system -> /run/current-system	2012-07-16 11:34:21 -04:00
swap.nix
system-path.nix	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-07-16 17:27:11 -04:00
timezone.nix
unix-odbc-drivers.nix
users-groups.nix	Global replace /var/run/current-system -> /run/current-system	2012-07-16 11:34:21 -04:00