Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates ... Conflicts (simple): pkgs/applications/networking/browsers/chromium/default.nix pkgs/development/libraries/libsoup/default.nix pkgs/os-specific/linux/kernel/manual-config.nix pkgs/os-specific/linux/qemu-kvm/default.nix		2013-03-02 10:41:53 +01:00
..
browsers	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
cluster	hadoop: update to version 2.0.2-alpha	2012-10-26 11:10:13 +02:00
dropbox	dropbox: cosmetic changes	2013-01-21 11:20:30 +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
irc	weechat: upgrade to 0.4.0	2013-01-22 12:58:18 +01:00
mailreaders	notmuch: update from 0.14 to 0.15	2013-02-19 04:46:47 +01:00
msmtp
mumble	Updating mumble to 1.2.3 and adding pkgconfig as an input as it fails to build without it.	2012-03-16 19:19:00 +00:00
netperf	netperf: update to version 2.6.0	2012-08-10 11:56:22 +02:00
newsreaders	pan: Updated to 0.139	2012-07-11 17:05:13 -04:00
offrss	offrss: update to 1.3	2012-06-27 23:19:30 +02:00
p2p	gnunet: update to 0.9.5	2013-01-06 10:53:17 +01:00
pjsip
remote	update freerdp to 1.0.1 and unstable version.	2012-12-18 09:57:07 +01:00
siproxd
sniffers	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
sync	Clean up redundant "if condition then true else false"	2012-12-28 19:57:47 +01:00
umurmur	Adding umurmur and protobuf-c.	2012-09-25 19:35:03 +02:00
vnstat	vnstat: upgrade to 1.11	2012-09-02 11:57:49 +02:00
yafc	yafc: update to 1.2.3	2012-09-06 17:31:40 +02:00