Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates ... Conflict in kerberos, which was updated both in master and in stdenv-updates. Kept the stdenv-updates version, except pulled in the enableParallelBuilding change from master. Signed-off-by: Shea Levy <shea@shealevy.com> Conflicts: pkgs/development/libraries/kerberos/krb5.nix		2013-05-04 18:28:48 -04:00
..
builder.sh
default-builder.sh
default.nix	Merge branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04:00
setup.sh	stdenv/setup.sh: Always run postPatch hook.	2013-02-27 15:26:18 +01:00