Danny Wilson d007a78ccb Merge remote-tracking branch 'origin/stdenv-updates' into illumos ... Conflicts: pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/mpc/default.nix pkgs/development/libraries/mpfr/default.nix pkgs/development/libraries/ppl/default.nix pkgs/tools/misc/coreutils/default.nix		2013-03-17 13:22:24 +01:00
..
default.nix	Merge remote-tracking branch 'origin/stdenv-updates' into illumos	2013-03-17 13:22:24 +01:00
docbook2texi.patch