# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1214957276 0
# Node ID d724db7836efdb085cf0934df3a9c594d7d108d2
# Parent  3c1f1bed5be2a648d5cc8bae6d47a80aec536d90
Apologies for that long merge; I used the wrong tree. Moved the 'website' / 'dev_website' changelog.api entry to the right place

diff -r 3c1f1bed5be2 -r d724db7836ef ChangeLog.API
--- a/ChangeLog.API	Wed Jul 02 00:06:25 2008 +0000
+++ b/ChangeLog.API	Wed Jul 02 00:07:56 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
@@ -37,10 +38,6 @@
 		* GTK+ Custom Smiley API.
 
 version 2.4.2 (05/17/2008):
-version 2.x.x:
-	libpurple:
-	   Added:
-	   * "website" and "dev_website" items to the ui_info hash table
 	perl:
 		Added:
 		* Purple::Prefs::get_children_names.