Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/libav/default.nix pkgs/shells/bash/bash-4.2-patches.nix pkgs/stdenv/generic/default.nix		2014-10-07 00:09:37 +02:00
..
auto.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
default.nix	Manual: Remove some option defaults that refer to store paths	2014-09-18 16:21:26 +02:00
gdm.nix	Fix nixos-rebuild evaluation	2014-09-23 14:01:25 +02:00
kdm.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
lightdm.nix	FONTCONFIG_FILE: remove setters to /etc/fonts/fonts.conf	2014-10-05 17:05:27 +02:00
slim.nix	Add extraConfig option for SLiM	2014-08-31 03:21:37 +02:00