Luca Bruno 83221f3886 Merge branch 'master' into staging ... Makes the build more useful: - Disabled hybrid iso, makes installer tests pass again - Imagemagick fixes to the "Illegal instruction" thing		2014-11-08 15:56:40 +01:00
..
80-net-name-slot.rules
acpid.nix
amd-hybrid-graphics.nix
bluetooth.nix
nvidia-optimus.nix
pcscd.nix
pommed.nix	Manual: Remove some option defaults that refer to store paths	2014-09-18 16:21:26 +02:00
sane.nix
tcsd.nix
thermald.nix	thermald needs dbus config files to run	2014-11-06 15:19:33 +02:00
thinkfan.nix
udev.nix	Merge recent master into staging	2014-10-23 17:40:41 +02:00
udisks2.nix
upower.nix