/pidgin/main: 09478bc2e043: Merge 2.x.y

Tomasz Wasilczyk <[email protected]>
Newsgroups gmane.comp.gnome.gaim.cvs
Message-ID <[email protected]>
Changeset: 09478bc2e043ce741f257beeb8c3ad26162dccc0
Author:	 Tomasz Wasilczyk <[email protected]>
Date:	 2014-11-06 15:15 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/09478bc2e043

Description:

Merge 2.x.y

diffstat:

 po/POTFILES.in |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (11 lines):

diff --git a/po/POTFILES.in b/po/POTFILES.in
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -79,6 +79,7 @@ libpurple/plugins/perl/perl.c
 libpurple/plugins/psychic.c
 libpurple/plugins/signals-test.c
 libpurple/plugins/simple.c
+libpurple/plugins/ssl/nss-prefs.c
 libpurple/plugins/ssl/ssl-gnutls.c
 libpurple/plugins/ssl/ssl-nss.c
 libpurple/plugins/ssl/ssl.c
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.