Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
desktop-managers	Merge recent master into x-updates	2014-08-02 05:08:07 +02:00
display-managers	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
hardware	nixos synaptics: allow null value for accelFactor, minSpeed and maxSpeed	2014-08-04 13:42:27 +02:00
window-managers	Get all lib functions from lib, not pkgs.lib, in modules	2014-07-02 12:28:18 -04: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	Enable the xf86-video-modesetting driver	2014-05-21 15:55:50 +02:00