Vladimír Čunát d4e9fd2a90 Merge recent master into staging ... Hydra: ?compare=1148749 Conflicts (easy): nixos/modules/virtualisation/containers.nix		2014-08-21 15:09:31 +02:00
..
cd-dvd	Mount unionfs-fuse filesystems using the normal fileSystems option	2014-07-30 16:04:15 +02:00
scan	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
tools	Merge recent master into staging	2014-08-21 15:09:31 +02:00
virtualbox-demo.nix	Rename hardware.opengl.videoDrivers back to services.xserver.videoDrivers	2014-04-29 14:42:36 +02:00