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
..
autofs.nix	* Use boot.kernelModules everywhere instead of explicit calls to	2012-03-17 17:26:17 +00:00
disnix.nix	Global replace /var/run/current-system -> /run/current-system	2012-07-16 11:34:21 -04:00
felix.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
folding-at-home.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
gpsd.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
nix-daemon.nix	Use socket-based activation of the Nix daemon	2012-06-18 23:31:07 -04:00
nix-gc.nix	* Add options to handle automatic calls to the garbage collector.	2009-12-04 12:50:44 +00:00
nixos-manual.nix	* Add type.	2012-06-04 14:35:48 +00:00
rogue.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
svnserve.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
synergy.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00