Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/poppler/default.nix		2014-10-16 15:16:50 +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	stumpwm: update and refactoring	2014-10-05 14:50:08 +02:00
redshift.nix
terminal-server.nix
xfs.conf
xfs.nix
xserver.nix	FONTCONFIG_FILE: remove setters to /etc/fonts/fonts.conf	2014-10-05 17:05:27 +02:00