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
..
heimdal.nix	heimdal: add sqlite support and install server executables to $out/sbin	2010-08-06 08:52:47 +00:00
krb5.nix	Merge branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04:00
no-md2.patch	* Remove MD2 support from Heimdal because OpenSSL 1.0.0 no longer has	2010-07-19 08:39:02 +00:00