Vladimír Čunát 0a58b512cb Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/compilers/gcc/4.8/default.nix pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/gmp/5.1.3.nix pkgs/development/libraries/gmp/5.1.x.nix pkgs/top-level/all-packages.nix		2014-01-18 14:46:20 +01:00
..
amule	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-12-10 00:25:54 +01:00
azureus	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
bit-tornado	Some description fixes	2013-10-05 19:36:23 +02:00
bittorrent	Revert "fix bittorrent by using buildPythonPackage"	2012-02-28 00:06:36 +00:00
gtk-gnutella	gtkgnutella: update from 1.0.0 to 1.0.1	2014-01-15 17:29:14 +01:00
libtorrent	libtorrent: update from 0.13.2 to 0.13.3	2013-12-09 11:18:17 +02:00
rtorrent	rtorrent: update to version 0.9.3	2013-12-09 22:35:32 +01:00
seeks	Seeks 0.4.1.	2012-07-05 00:52:36 +02:00
tahoe-lafs	tahoe-lafs: Upgrade from 1.9.2 -> 1.10.0	2014-01-10 18:50:42 -06:00