pidgin/pidgin

Merge
release-2.x.y
2014-01-21, Daniel Atallah
c6b894d730dd
Parents 3542f04b5e52cfc982b1974a
Children c50107c76447
Merge
2 files changed, 2 insertions(+), 1 deletions(-)
  • +1 -1
    ChangeLog
  • +1 -0
    po/POTFILES.in
    • --- a/ChangeLog Tue Jan 21 23:09:37 2014 -0500
    +++ b/ChangeLog Tue Jan 21 23:12:23 2014 -0500
    @@ -1,6 +1,6 @@
    Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
    -version 2.10.8:
    +version 2.10.8 (1/28/2014):
    General:
    * Python build scripts and example plugins are now compatible with
    Python 3. (Ashish Gupta) (#15624)
    --- a/po/POTFILES.in Tue Jan 21 23:09:37 2014 -0500
    +++ b/po/POTFILES.in Tue Jan 21 23:12:23 2014 -0500
    @@ -261,5 +261,6 @@
    pidgin/plugins/vvconfig.c
    pidgin/plugins/win32/transparency/win2ktrans.c
    pidgin/plugins/win32/winprefs/winprefs.c
    +pidgin/plugins/unity.c
    pidgin/plugins/xmppconsole.c
    pidgin/win32/nsis/nsis_translations.desktop.in