# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1215008966 0
# Node ID f37b3e57fb92682653cb0a9553702485ac9bb11a
# Parent  f57f47fbf7a9154fea21a01e6fcbee2871844619# Parent  4a4f733c4bf191911ff1c613d327464c9b6a8c63
merge of '0fdedeeaa99f758f800b86adc9613eac6f3bf692'
     and '4064d5f0f7c619ef0367860f61e4bf45834a6f76'

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