Mercurial > pidgin
diff ChangeLog @ 28531:aa8fa6335c9c
merge of '16c47a3521f79a6091f5196bb3649c2f9ca2922f'
and '52d17b90bdf3dffc10c5d87ea7ae1e59e7972436'
author | maiku@pidgin.im |
---|---|
date | Wed, 11 Nov 2009 02:06:19 +0000 |
parents | 817cba320d5d |
children | 738cd1adb3cf f93ac891ff01 |
line wrap: on
line diff
--- a/ChangeLog Wed Nov 11 02:05:01 2009 +0000 +++ b/ChangeLog Wed Nov 11 02:06:19 2009 +0000 @@ -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')