# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1215017583 0
# Node ID c3cdc0ea9af56e7cc4d571a592a1b96b36c892b2
# Parent  7ec3dce64369ab03d15c0975b626d7467ac02edc# Parent  f37b3e57fb92682653cb0a9553702485ac9bb11a
merge of '1765bbc5f2dd4d43054659bea654f9bd822d2c2e'
     and '3008dd1f70a9e9ddc2bbe30c0fae7aba334836fe'

diff -r 7ec3dce64369 -r c3cdc0ea9af5 ChangeLog.API
--- 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
diff -r 7ec3dce64369 -r c3cdc0ea9af5 libpurple/protocols/silc/silc.c
--- 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;
diff -r 7ec3dce64369 -r c3cdc0ea9af5 libpurple/protocols/silc10/silc.c
--- 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;