diff options
author | dx <dx@dxzone.com.ar> | 2017-05-27 20:04:10 -0300 |
---|---|---|
committer | dx <dx@dxzone.com.ar> | 2017-05-27 20:04:10 -0300 |
commit | 86d30dad52ce5e0a57bee36e28e31b7af71cfc01 (patch) | |
tree | 3be2f68ba23f8db1fbd1508352d0f126e221f267 /ChangeLog | |
parent | 857c1549611bebed988fa6e8e8294335aaa562bf (diff) | |
parent | 64f413d0e3c8e0ddef868b5ca99dd5eecacdf781 (diff) | |
download | pidgin-86d30dad52ce5e0a57bee36e28e31b7af71cfc01.tar.gz |
Merge release-2.x.y changes, fix changelog conflicts
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1,6 +1,9 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul version 2.12.1 (??/??/????): + libpurple: + * Unified string comparison. (PR #186) (Arkadiy Illarionov) + XMPP: * Show XEP-0066 OOB URLs in any message, not just headlines |