Mercurial > pidgin.yaz
changeset 23330:85ca57711e93
merge of 'f7176494034dd112dc3416db787a73b6dc67007b'
and 'fcc768ad62bc878c93d5b88b758d5e17251c9ebe'
| author | Kevin Stange <kevin@simguy.net> |
|---|---|
| date | Sun, 08 Jun 2008 23:00:36 +0000 |
| parents | 6595af65ef45 (diff) 97a01e09a3b4 (current diff) |
| children | d4f12325e599 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jun 08 22:59:32 2008 +0000 +++ b/ChangeLog Sun Jun 08 23:00:36 2008 +0000 @@ -13,8 +13,8 @@ entries via the buddy list entry right-click menu. * Resize large incoming custom smileys to a maximum of 96px on either side. - * Automatically offer to merge buddies into the same contact if the - alias given matches that of existing buddies in the same group. + * Offer to add new buddies into the same contact as existing buddies + in the same group if the alias given is the same. General: * Group and Chat buddy list entries can now be given custom buddy