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	Fix predictable network interface naming	2014-04-18 19:34:45 +02:00
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	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
nvidia-optimus.nix	Get all lib functions from lib, not pkgs.lib, in modules	2014-07-02 12:28:18 -04:00
pcscd.nix	pcscd: Refactor service and use socket activation	2014-04-19 14:37:31 +01:00
pommed.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
sane.nix	nixos: Add option hardware.sane.configDir	2014-06-24 10:52:12 +02:00
tcsd.nix	Add types to tcsd config options.	2014-04-22 14:05:09 +02:00
thinkfan.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
udev.nix	Fix udev rule required by gpm	2014-05-20 13:09:41 +02:00
udisks2.nix	Enable udisks2 by default	2014-04-19 14:41:21 +02:00
upower.nix	upower: add 0.99 version for gnome 3.12	2014-05-20 13:41:39 +02:00