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
..
amule	amule: update and fix build on gcc47	2013-03-17 10:15:03 +01:00
azureus	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
bit-tornado	* Apply r32435 from the trunk (always build Python with SSL support).	2012-02-21 23:35:35 +00:00
bittorrent	Revert "fix bittorrent by using buildPythonPackage"	2012-02-28 00:06:36 +00:00
gtk-gnutella	pkgs/tools/networking/p2p/gtk-gnutella/builder.sh: dropped obsolete file	2011-08-29 22:21:29 +00:00
libtorrent	libtorrent: updated to version 0.13.2	2012-06-16 14:15:42 +00:00
rtorrent	rtorrent: updated to version 0.9.2	2012-06-16 14:15:46 +00:00
seeks	Seeks 0.4.1.	2012-07-05 00:52:36 +02:00
tahoe-lafs	tahoe-lafs: update to 1.9.2	2013-04-24 22:41:17 +04:00