/pidgin/main: c50107c76447: Clean merge.

[Mark Doliner]

Changeset: c50107c76447a206f61619a0cfcbe019fe3165f3
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2014-01-21 20:55 -0800
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/c50107c76447

Description:

Clean merge.

diffstat:

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

diffs (11 lines):

diff --git a/po/POTFILES.skip b/po/POTFILES.skip
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -37,6 +37,7 @@ libpurple/plugins/perl/common/Util.c
 libpurple/plugins/perl/common/Whiteboard.c
 libpurple/plugins/perl/common/XMLNode.c
 libpurple/protocols/null/nullprpl.c
+pidgin.desktop.in.in
 pidgin/plugins/crazychat/cc_pidgin_plugin.c
 pidgin/plugins/perl/common/GtkAccount.c
 pidgin/plugins/perl/common/GtkBlist.c