Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size ... Let's get rid of those merge conflicts.		2016-02-03 16:57:19 +01:00
..
cd-dvd	jobs -> systemd.services	2016-01-17 22:05:13 +00:00
scan	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
tools	Merge recent 'staging' into closure-size	2016-02-03 16:57:19 +01:00
virtualbox-demo.nix	Revert "Revert "Merge pull request #2449 from wkennington/master.grub""	2014-09-02 09:16:13 -07:00