Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/tools/misc/binutils/default.nix pkgs/tools/package-management/disnix/default.nix pkgs/top-level/all-packages.nix		2013-07-08 10:48:05 +02:00
..
bzip2	* New bootstrap binaries (from r16022 in the trunk). Don't set	2009-06-22 19:49:42 +00:00
cpio	* New bootstrap binaries (from r16022 in the trunk). Don't set	2009-06-22 19:49:42 +00:00
curl.bz2	* New bootstrap binaries (from r16022 in the trunk). Don't set	2009-06-22 19:49:42 +00:00
default.nix	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
ln	* New bootstrap binaries (from r16022 in the trunk). Don't set	2009-06-22 19:49:42 +00:00
mkdir	* New bootstrap binaries (from r16022 in the trunk). Don't set	2009-06-22 19:49:42 +00:00
sh	* New bootstrap binaries (from r16022 in the trunk). Don't set	2009-06-22 19:49:42 +00:00