Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
freenet	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
gnunet	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
ktorrent
ldcpp
mldonkey
ncdc
qbittorrent
retroshare	Adding retroshare 0.6 (unstable)	2014-07-09 22:24:28 +02:00
transmission	transmission: Update from 2.83 -> 2.84	2014-07-03 11:39:11 +02:00
transmission-remote-gtk
tribler	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
twister	twister: Add new package, version 0.9.22.	2014-07-13 23:56:11 +02:00