Vladimír Čunát 87c3c0e885 Merge master into #2129 ... Conflicts (easy, just UID shifted): nixos/modules/misc/ids.nix nixos/modules/module-list.nix		2014-08-12 19:24:08 +02:00
..
80-net-name-slot.rules
acpid.nix	Merge remote-tracking branch 'origin/master' into staging	2014-07-07 13:16:26 +02:00
amd-hybrid-graphics.nix	Get all lib functions from lib, not pkgs.lib, in modules	2014-07-02 12:28:18 -04:00
bluetooth.nix
nvidia-optimus.nix	Get all lib functions from lib, not pkgs.lib, in modules	2014-07-02 12:28:18 -04:00
pcscd.nix
pommed.nix
sane.nix	nixos: Add option hardware.sane.configDir	2014-06-24 10:52:12 +02:00
tcsd.nix
thinkfan.nix
udev.nix
udisks2.nix
upower.nix