Mercurial > pidgin
changeset 23408:f37b3e57fb92
merge of '0fdedeeaa99f758f800b86adc9613eac6f3bf692'
and '4064d5f0f7c619ef0367860f61e4bf45834a6f76'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Wed, 02 Jul 2008 14:29:26 +0000 |
| parents | f57f47fbf7a9 (current diff) 4a4f733c4bf1 (diff) |
| children | c3cdc0ea9af5 |
| files | |
| diffstat | 3 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Wed Jul 02 12:40:38 2008 +0000 +++ b/ChangeLog.API Wed Jul 02 14:29:26 2008 +0000 @@ -17,6 +17,7 @@ * purple_buddy_icons_node_set_custom_icon_from_file * purple_notify_user_info_prepend_section_break * purple_notify_user_info_prepend_section_header + * "website" and "dev_website" items to the ui_info hash table Deprecated: * purple_blist_update_buddy_icon
--- a/libpurple/protocols/silc/silc.c Wed Jul 02 12:40:38 2008 +0000 +++ b/libpurple/protocols/silc/silc.c Wed Jul 02 14:29:26 2008 +0000 @@ -22,6 +22,7 @@ #include "silcpurple.h" #include "version.h" #include "wb.h" +#include "core.h" extern SilcClientOperations ops; static PurplePlugin *silc_plugin = NULL;
--- a/libpurple/protocols/silc10/silc.c Wed Jul 02 12:40:38 2008 +0000 +++ b/libpurple/protocols/silc10/silc.c Wed Jul 02 14:29:26 2008 +0000 @@ -22,6 +22,7 @@ #include "silcpurple.h" #include "version.h" #include "wb.h" +#include "core.h" extern SilcClientOperations ops; static PurplePlugin *silc_plugin = NULL;