pidgin/pidgin

Clean merge.
release-2.x.y
2014-01-21, Mark Doliner
c50107c76447
Parents c6b894d730ddace311008604
Children a6226b0afc48
Clean merge.
1 files changed, 1 insertions(+), 0 deletions(-)
  • +1 -0
    po/POTFILES.skip
    • --- a/po/POTFILES.skip Tue Jan 21 23:12:23 2014 -0500
    +++ b/po/POTFILES.skip Tue Jan 21 20:55:58 2014 -0800
    @@ -37,6 +37,7 @@
    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