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
..
armv5tel	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
armv6l
armv7l
i686	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
loongson2f	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
powerpc	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
x86_64