pidgin: 832944b7: Apologies for that long merge; I used th...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 832944b7a14dd52ae7df0e345e0b16b77501edd5
Ancestor: 1a0a54f3444143252cd80a3eae2d633ce24b94e7
Author: evands at pidgin.im
Date: 2008-07-02T00:07:56
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/832944b7a14dd52ae7df0e345e0b16b77501edd5

Modified files:
        ChangeLog.API

ChangeLog: 

Apologies for that long merge; I used the wrong tree. Moved the 'website' / 'dev_website' changelog.api entry to the right place

-------------- next part --------------
============================================================
--- ChangeLog.API	6a1fb8dcd4381b7e31c37738988289efe40a5b07
+++ ChangeLog.API	70c67c9c271cfc8d1dc488619fcbd1f288e56501
@@ -17,6 +17,7 @@ version 2.5.0 (??/??/2008):
 		* 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 @@ version 2.4.2 (05/17/2008):
 		* 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.