Eelco Dolstra 585983bc95 Merge remote-tracking branch 'origin/staging' ... Conflicts: pkgs/applications/version-management/subversion/default.nix		2014-09-08 11:42:09 +02:00
..
cd-dvd	Remove unrar from the installation CD since it's unfree	2014-09-05 14:25:17 +02:00
scan	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
tools	Merge remote-tracking branch 'origin/staging'	2014-09-08 11:42:09 +02:00
virtualbox-demo.nix	Revert "Revert "Merge pull request #2449 from wkennington/master.grub""	2014-09-02 09:16:13 -07:00