diff ChangeLog @ 28912:0399f8ef665a

merged with im.pidgin.pidgin

--- a/ChangeLog	Sun Nov 08 02:21:28 2009 +0900
+++ b/ChangeLog	Fri Nov 13 15:04:10 2009 +0900
@@ -4,6 +4,8 @@
 version 2.6.4 (??/??/20??):
 	libpurple:
 	* Actually emit the hold signal for media calls.
+	* Added "MXit" protocol plugin, supported and maintained by the MXit folks
+	  themselves (MXit Lifestyle (Pty) Ltd.)
 
 	General:
 	* New 'plugins' sub-command to 'debug' command (i.e. '/debug plugins')
@@ -40,6 +42,8 @@
 	  account's domain, and use that for voice and video if found and the user 
 	  didn't set one manually in prefs.
 	* Fix a crash when adding a buddy without an '@'.
+	* Don't show the option to send a file to a buddy if we know for certain
+	  they don't support any file transfer method supported by libpurple.
 
 	Yahoo:
 	* Fix sending /buzz.