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	gtkLibs.gtk moved to gtk	2012-03-15 07:19:12 +00:00
display-managers	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-07-16 17:27:11 -04:00
hardware	D'oh	2012-07-16 08:11:44 -04:00
window-managers	Don't add the i3 window manager to the system if it isn't enabled in configuration.nix.	2012-07-12 11:33:10 +02:00
terminal-server.nix	* Remove xdpyinfo from the $PATH.	2011-11-11 03:11:32 +00:00
xfs.conf	Global replace /var/run/current-system -> /run/current-system	2012-07-16 11:34:21 -04:00
xfs.nix	renamed "all-interfaces" to "networking"	2012-03-04 18:44:42 +00:00
xserver.nix	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-07-16 17:27:11 -04:00