changeset
merge of '18fd5c1b38959e948adbea5928f7c406754ba464'
Wed, 02 Jul 2008 14:29:26 +0000
- author
- Stu Tomlinson <nosnilmot@pidgin.im>
- date
- Wed, 02 Jul 2008 14:29:26 +0000
- changeset 23552
- 0ff0084d6687
- parent 23547
- 18fd5c1b3895 (current diff)
- parent 23551
- b6109bbbbe6c (diff)
- child 23553
- a2664d59d541
merge of '18fd5c1b38959e948adbea5928f7c406754ba464'
and 'b6109bbbbe6c97db75369c7a964692b3281fc8b8'
--- 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;
