# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1238746642 0
# Node ID a6974c0d789b574c1ac02053855a54f48113f6d0
# Parent  a78adf8b4b282019f6760eb0deee1dddc09ba179
Add some ChangeLog stuff.

diff -r a78adf8b4b28 -r a6974c0d789b ChangeLog
--- a/ChangeLog	Fri Apr 03 07:54:24 2009 +0000
+++ b/ChangeLog	Fri Apr 03 08:17:22 2009 +0000
@@ -10,6 +10,8 @@
 	* Fixed NTLM authentication on big-endian systems.
 
 	XMPP:
+	* Add voice & video support with Jingle (XEP-0166, 0167, 0176, & 0177),
+	  and voice support with GTalk and GMail. (Mike "Maiku" Ruprecht)
 	* Add support for in-band bytestreams for file transfers (XEP-0047).
 	* Add support for sending attentions (equivalent to "buzz" and "nudge")
 	  using the command /buzz (XEP-0224).
diff -r a78adf8b4b28 -r a6974c0d789b ChangeLog.API
--- a/ChangeLog.API	Fri Apr 03 07:54:24 2009 +0000
+++ b/ChangeLog.API	Fri Apr 03 08:17:22 2009 +0000
@@ -1,14 +1,9 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version ?.?.? (??/??/????):
-	libpurple:
-		Added:
-		* PurpleMedia API
-		* xmlnode_get_parent
-
 version 2.6.0 (??/??/2009):
 	libpurple:
 		Added:
+		* PurpleMedia and PurpleMediaManager API
 		* PURPLE_BLIST_NODE
 		* PURPLE_GROUP
 		* PURPLE_CONTACT
@@ -27,11 +22,14 @@
 		* purple_global_proxy_set_info
 		* purple_log_get_activity_score
 		* purple_network_force_online
+		* purple_prpl_get_media_caps
+		* purple_prpl_initiate_media
 		* purple_request_field_get_group
 		* purple_request_field_get_ui_data
 		* purple_request_field_set_ui_data
 		* purple_strequal
 		* xmlnode_from_file
+		* xmlnode_get_parent
 		* xmlnode_set_attrib_full
 
 		Changed:
@@ -66,6 +64,7 @@
 		* gtk_imhtml_set_return_inserts_newline
 		* pidgin_blist_set_theme
 		* pidgin_blist_get_theme
+		* pidgin_prefs_labeled_password
 		* pidgin_sound_is_customized
 		* pidgin_utils_init, pidgin_utils_uninit
 		* pidgin_notify_pounce_add