Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging. ... Conflicts: pkgs/development/libraries/ffmpeg/2.x.nix pkgs/development/libraries/serf/default.nix		2014-09-02 12:31:03 +02:00
..
cd-dvd	nixos/manual: Use literalExample when feasible.	2014-08-27 23:41:15 +02:00
scan
tools	Merge branch 'origin/master' into staging.	2014-09-02 12:31:03 +02:00
virtualbox-demo.nix	Revert "Merge pull request #2449 from wkennington/master.grub"	2014-08-31 12:58:37 +04:00