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	Reverting revisions 30103-30106: "always set nixpkgs.config.{state,store}Dir", etc.	2011-10-30 15:19:58 +00:00
gnu.nix	GNU: Comment `fdisk' out.	2012-04-24 12:54:42 +00:00
i18n.nix	* Initialise $LOCALE_ARCHIVE earlier in /etc/profile to prevent the	2012-03-19 02:53:58 +00:00
krb5.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
ldap.nix	Add more options for LDAP module. (timeLimit, bind.timeLimit, bind.policy)	2011-10-30 18:46:31 +00:00
networking.nix	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-07-16 17:27:11 -04:00
no-x-libs.nix	splitted ssh/sshd X11 forwarding logic. Backward compatible change.	2012-03-25 15:42:05 +00:00
nsswitch-mdns.conf	NSS-mDNS: Allow both IPv4 and IPv6 address resolution.	2010-10-07 20:10:40 +00:00
nsswitch.conf	Adding 'ethers' on nsswitch.	2011-04-20 20:59:07 +00:00
nsswitch.nix	Oops.	2009-06-26 21:39:31 +00:00
power-management.nix	* Use boot.kernelModules everywhere instead of explicit calls to	2012-03-17 17:26:17 +00:00
pulseaudio.nix	* Revert r30370, it's no longer needed.	2011-11-11 15:02:30 +00:00
shells.nix	Global replace /var/run/current-system -> /run/current-system	2012-07-16 11:34:21 -04:00
swap.nix	* Oops, fix an incomplete commit.	2012-06-13 03:28:03 +00:00
system-path.nix	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-07-16 17:27:11 -04:00
timezone.nix	Rename time.clockLocal -> time.hardwareClockInLocalTime.	2012-07-11 15:33:34 -04:00
unix-odbc-drivers.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
users-groups.nix	Global replace /var/run/current-system -> /run/current-system	2012-07-16 11:34:21 -04:00