nixpkgs/pkgs/applications/networking/instant-messengers
Vladimír Čunát 5979d428b4 Merge recent master into x-updates
Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
2014-07-09 22:13:29 +02:00
..
amsn
baresip Update baresip 2014-07-01 11:54:09 +04:00
bitlbee
carrier
centerim
ekiga
freetalk
fuze
gajim
gtmess
hipchat hipchat: Fix access to /usr/share/X11/xkb 2014-05-27 01:06:54 +02:00
jitsi
kadu
linphone
mcabber
oneteam
pidgin
pidgin-plugins
psi
salut-a-toi
sflphone
silc-client
skype skype: 4.2.0.13 -> 4.3.0.37 2014-06-26 22:42:21 +07:00
skype-call-recorder
teamspeak Add TeamSpeak 3 server & service module (close #2056) 2014-05-27 17:30:26 +02:00
telegram-cli
telepathy Merge recent master into x-updates 2014-07-09 22:13:29 +02:00
tkabber
torchat
toxic
twinkle
vacuum