Moritz Ulrich f49becb7a6 Merge branch 'master' into dropbox-py ... Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de> Conflicts: pkgs/top-level/all-packages.nix		2013-04-04 00:18:48 +02:00
..
browsers	conkeror: Update to 1.0pre-20130401.	2013-04-03 22:48:17 +04:00
cluster	hadoop: update to version 2.0.2-alpha	2012-10-26 11:10:13 +02:00
dropbox	dropbox: add x86 support	2013-03-26 16:39:03 +01:00
dropbox-cli	Fix platform note in dropbox-cli	2013-03-27 20:56:46 +01:00
esniper	esniper: update to version 2.28.0	2012-10-26 10:32:23 +02:00
ftp/filezilla	Added FileZilla-3.6.0.2.	2012-12-31 11:59:08 +01:00
instant-messengers	centerim: fix from debian	2013-02-28 15:11:03 +01:00
iptraf	get iptraf to compile	2013-03-24 14:44:10 +01:00
irc	Add patch to fix build for bip.	2013-03-12 18:23:55 +00:00
mailreaders	notmuch: update to 0.15.2	2013-03-17 15:13:53 +01:00
msmtp	msmtp: Update to 1.4.30, added optional libraries as dependency and point to correct license	2013-03-10 21:17:17 +01:00
mumble
netperf
newsreaders
offrss
p2p	transmission: nicer about disabling gtk	2013-03-17 22:30:42 +01:00
pjsip
remote	Fixing the teamviewer evaluation and builds.	2013-03-22 16:16:37 +01:00
siproxd
sniffers	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
sync	rsync: add meta.license attribute	2013-03-25 12:44:22 +01:00
umurmur	Adding umurmur and protobuf-c.	2012-09-25 19:35:03 +02:00
vnstat
yafc