Merge 2.x.y

Thu, 06 Nov 2014 15:15:12 +0100

author
Tomasz Wasilczyk <twasilczyk@pidgin.im>
date
Thu, 06 Nov 2014 15:15:12 +0100
changeset 36234
09478bc2e043
parent 36232
9ba4a2b8ecd1 (current diff)
parent 36233
2d081c7c20eb (diff)
child 36236
3b264e3c6710

Merge 2.x.y

po/POTFILES.in file | annotate | diff | comparison | revisions
--- a/po/POTFILES.in	Wed Nov 05 14:02:06 2014 -0500
+++ b/po/POTFILES.in	Thu Nov 06 15:15:12 2014 +0100
@@ -79,6 +79,7 @@
 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

mercurial