summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMárcio Alexandre Silva Delgado <coadde@lavabit.com>2013-08-16 15:58:08 -0300
committerMárcio Alexandre Silva Delgado <coadde@lavabit.com>2013-08-16 15:58:08 -0300
commita339cc5b2a1aab4c6670ed8e2d304468eb81e8d7 (patch)
treec21b815efb7390c0b4007a7811f79f6d96eab330
parentda420236c25643d90351d1579977cb453d56f66e (diff)
parentdf480f9523a2417919ec323feb3966ca9ce3076e (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/blacklist
-rw-r--r--your-coherence-blacklist.txt16
1 files changed, 8 insertions, 8 deletions
diff --git a/your-coherence-blacklist.txt b/your-coherence-blacklist.txt
index f7823be..24d5a97 100644
--- a/your-coherence-blacklist.txt
+++ b/your-coherence-blacklist.txt
@@ -1,11 +1,11 @@
-amsn: support only MSN
+amsn:: support only MSN
bitlbee:bitlbee-coherence: removed support for MSN, Yahoo!, AIM, ICQ, Twitter
bti:bti-coherence: removed support for Twitter
centerim:centerim-coherence: contains nonfree services
choqok:choqok-coherence: removed support for Twitter
ekg:: only useful with Gadu-Gadu service
ekg2:ekx2: contains nonfree services and recommend Gadu-Gadu service
-emsene: support only MSN
+emsene:: support only MSN
empathy:empathy-coherence: contains nonfree services
google-gadgets-gtk
google-gadgets-qt
@@ -18,17 +18,17 @@ kdenetwork-kopete-libre:kdenetwork-kopete-libre-coherence: contains nonfree serv
kdepim-runtime:kdepim-runtime-coherence: depends libkgapi package
libgadu:: only useful with Gadu-Gadu service
libkfbapi:: only useful with Facebook service
-libkgapi: useful just with Google services
-libmsn: only useful for MSN support in kdenetwork-kopete-libre
+libkgapi:: useful just with Google services
+libmsn:: only useful for MSN support in kdenetwork-kopete-libre
licq:lxmpp: contains nonfree services and recommend ICQ service
naim:nxmpp: contains nonfree services and recommend AIM service
-papyon: only useful with MSN
+papyon:: only useful with MSN
perl-mail-domainkeys:: only useful with Yahoo Mail service
pidgin:pidgin-coherence: contains nonfree services
pidgin-gfire:: only useful with Xfire service
pork:pork-coherence: contains nonfree services
pyicqt:: only useful with ICQ service
-pymsnt: provide MSN transport for Jabber
-s3cmd: only useful with Amazon S3
+pymsnt:: provide MSN transport for Jabber
+s3cmd:: only useful with Amazon S3
ttytter:: only useful with Twitter service
-yahoo-t: provide Yahoo! transport for Jabber
+yahoo-t:: provide Yahoo! transport for Jabber