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
..
amsn
baresip	Update baresip	2014-07-01 11:54:09 +04:00
bitlbee	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
carrier
centerim	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
ekiga
freetalk
fuze
gajim
gtmess	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
hipchat	hipchat: Fix access to /usr/share/X11/xkb	2014-05-27 01:06:54 +02:00
jitsi
kadu	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
linphone	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
mcabber
oneteam
pidgin
pidgin-plugins	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
psi
salut-a-toi
sflphone	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
silc-client	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
skype	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
skype-call-recorder	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
teamspeak	Add TeamSpeak 3 server & service module (close #2056)	2014-05-27 17:30:26 +02:00
telegram-cli	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
telepathy	Merge recent master into x-updates	2014-07-09 22:13:29 +02:00
tkabber
torchat
toxic	toxic: Update to latest upstream Git master.	2014-07-28 20:53:11 +02:00
twinkle
utox	add uTox	2014-07-31 12:59:03 +02:00
vacuum