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
..
bootstrap.nix
cppflags-include-fix.patch
default.nix	openjdk: Don't statically link C++ runtime, close #730.	2013-07-08 09:15:33 +02:00
generate-cacerts.pl
make-bootstrap.nix
no-crypto-restrictions.patch