Mercurial > pidgin.yaz
changeset 18777:ee655cba03ca
merge of '15b4112195b1600fef76bc8602fbcd00c9e3d11d'
and '4c9db6b9e8faa21fc798d3706e7603ea655b3b00'
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Thu, 02 Aug 2007 14:23:24 +0000 |
parents | 88ad571744b4 (current diff) adb8092d3267 (diff) |
children | 38bac267bf8e |
files | |
diffstat | 2 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Thu Aug 02 07:50:55 2007 +0000 +++ b/ChangeLog.API Thu Aug 02 14:23:24 2007 +0000 @@ -19,7 +19,6 @@ * purple_core_ensure_single_instance This is for UIs to use to ensure only one copy is running. * purple_dbus_is_owner - * purple_image_data_calculate_filename * purple_timeout_add_seconds Callers should prefer this to purple_timeout_add for timers longer than 1 second away. Be aware of the rounding, though.
--- a/po/POTFILES.in Thu Aug 02 07:50:55 2007 +0000 +++ b/po/POTFILES.in Thu Aug 02 14:23:24 2007 +0000 @@ -200,6 +200,7 @@ pidgin/plugins/gevolution/gevolution.c pidgin/plugins/gevolution/gevo-util.c pidgin/plugins/gevolution/new_person_dialog.c +pidgin/plugins/gtkbuddynote.c pidgin/plugins/gtk-signals-test.c pidgin/plugins/history.c pidgin/plugins/iconaway.c