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	Adding the binary files from stdenv that did not came with the recent 'diff | patch'	2009-11-08 00:45:09 +00:00
cpio	Adding the binary files from stdenv that did not came with the recent 'diff | patch'	2009-11-08 00:45:09 +00:00
curl.bz2	curl.bz2 should be executable, to keep the same stdenv working as it worked in stdenv-updates	2009-11-08 00:47:46 +00:00
default.nix	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
ln	Adding the binary files from stdenv that did not came with the recent 'diff | patch'	2009-11-08 00:45:09 +00:00
mkdir	Adding the binary files from stdenv that did not came with the recent 'diff | patch'	2009-11-08 00:45:09 +00:00
sh	Adding the binary files from stdenv that did not came with the recent 'diff | patch'	2009-11-08 00:45:09 +00:00