diff ChangeLog.API @ 28299:e5349d2cc7e5

merge of '249bb0ae011a3aacadd09bca9106b7ba41bf6b75' and 'dbc7434de32f5fbc5c23e94da10bed56418bfeab'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Tue, 18 Aug 2009 14:59:24 +0000
parents ba57b7deb58a 6dc7f2e36f72
children 584e063285b7 d83ee160ffb6
line wrap: on
line diff
--- a/ChangeLog.API	Tue Aug 18 06:33:25 2009 +0000
+++ b/ChangeLog.API	Tue Aug 18 14:59:24 2009 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.6.0 (??/??/2009):
+version 2.6.0 (08/18/2009):
 	libpurple:
 		Added:
 		* PurpleMedia and PurpleMediaManager API
@@ -176,6 +176,8 @@
 			* $xmlnode->to_str()
 			* $xmlnode->to_formatted_str()
 			* Purple::XMLNode::from_str(...)
+version 2.5.9 (08/18/2009):
+	No changes
 
 version 2.5.8 (06/27/2009):
 	No changes