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
..
desktop-managers	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
display-managers	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
hardware	nixos synaptics: allow null value for accelFactor, minSpeed and maxSpeed	2014-08-04 13:42:27 +02:00
window-managers	Ratpoison: updated for 1.4.8	2014-09-21 20:05:12 +01:00
redshift.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
terminal-server.nix	Rename hardware.opengl.videoDrivers back to services.xserver.videoDrivers	2014-04-29 14:42:36 +02:00
xfs.conf	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
xfs.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
xserver.nix	FONTCONFIG_FILE: remove setters to /etc/fonts/fonts.conf	2014-10-05 17:05:27 +02:00