Mercurial > pidgin
changeset 23410:c3cdc0ea9af5
merge of '1765bbc5f2dd4d43054659bea654f9bd822d2c2e'
and '3008dd1f70a9e9ddc2bbe30c0fae7aba334836fe'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Wed, 02 Jul 2008 16:53:03 +0000 |
| parents | 7ec3dce64369 (current diff) f37b3e57fb92 (diff) |
| children | 3c2963654752 |
| files | |
| diffstat | 3 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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;