changeset
Merge
Tue, 21 Jan 2014 23:12:23 -0500
- author
- Daniel Atallah <datallah@pidgin.im>
- date
- Tue, 21 Jan 2014 23:12:23 -0500
- branch
- release-2.x.y
- changeset 35284
- c6b894d730dd
- parent 35283
- 3542f04b5e52 (current diff)
- parent 35279
- cfc982b1974a (diff)
- child 35285
- c50107c76447
Merge
| ChangeLog | file | annotate | diff | comparison | revisions |
--- 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
