changeset
merge of '6d69bfb788e78644b15e67e72ed9bf04558a9274'
Wed, 02 Jul 2008 16:53:03 +0000
- author
- Richard Laager <rlaager@pidgin.im>
- date
- Wed, 02 Jul 2008 16:53:03 +0000
- changeset 23553
- a2664d59d541
- parent 23548
- 6d69bfb788e7 (current diff)
- parent 23552
- 0ff0084d6687 (diff)
- child 23554
- 70205212ca2b
merge of '6d69bfb788e78644b15e67e72ed9bf04558a9274'
and '0ff0084d668792d7c5f24cd4efee004b48b37d22'
--- a/ChangeLog.API Wed Jul 02 00:19:29 2008 +0000 +++ b/ChangeLog.API Wed Jul 02 16:53:03 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 00:19:29 2008 +0000 +++ b/libpurple/protocols/silc/silc.c Wed Jul 02 16:53:03 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 00:19:29 2008 +0000 +++ b/libpurple/protocols/silc10/silc.c Wed Jul 02 16:53:03 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;
