nixpkgs/pkgs/applications/networking
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
..
browsers Adding vimprobable2. Patch by Alexander Forenmy. 2012-01-04 22:12:43 +00:00
cluster/rq
ekiga
esniper esniper: fixed build with current version of curl 2011-11-07 17:48:51 +00:00
instant-messengers torchat: tell Hydra that it shouldn't attempt to build that package an Cygwin (fails with an assertion) 2011-12-11 18:35:20 +00:00
iptraf
irc * Fix Chatzilla (it doesn't work with recent Xulrunners). 2011-10-07 09:26:03 +00:00
kphone State qt version (3/4) in packages, not in all-packages.nix 2012-01-07 17:06:49 +00:00
linphone linphone-3.4.3 2011-08-18 12:52:41 +00:00
mailreaders notmuch use license path instead of string 2011-11-20 21:49:06 +00:00
msmtp
mumble
netperf Add netperf 2011-10-25 20:49:22 +00:00
newsreaders/pan
offrss
p2p svn merge ^/nixpkgs/trunk 2012-01-08 16:01:12 +00:00
pjsip
remote FreeRDP-unstable: Bump 2011-09-28 14:23:47 +00:00
siproxd
skype
sniffers wireshark: updated to version 1.6.2 2011-11-14 15:11:23 +00:00
sync Reintegrate branches/drop-kde4.5 2011-12-16 10:39:22 +00:00
twinkle State qt version (3/4) in packages, not in all-packages.nix 2012-01-07 17:06:49 +00:00
vnstat
yafc Added license to yafc 2011-10-20 11:17:24 +00:00