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
..
filesystems	Mount unionfs-fuse filesystems using the normal fileSystems option	2014-07-30 16:04:15 +02:00
cpu-freq.nix
encrypted-devices.nix
filesystems.nix	Mount unionfs-fuse filesystems using the normal fileSystems option	2014-07-30 16:04:15 +02:00
kbd.nix
lvm.nix
network-interfaces.nix
scsi-link-power-management.nix
swraid.nix
trackpoint.nix
tty-backgrounds-combine.sh