summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authordx <dx@dxzone.com.ar>2017-05-27 20:04:10 -0300
committerdx <dx@dxzone.com.ar>2017-05-27 20:04:10 -0300
commit86d30dad52ce5e0a57bee36e28e31b7af71cfc01 (patch)
tree3be2f68ba23f8db1fbd1508352d0f126e221f267 /ChangeLog
parent857c1549611bebed988fa6e8e8294335aaa562bf (diff)
parent64f413d0e3c8e0ddef868b5ca99dd5eecacdf781 (diff)
downloadpidgin-86d30dad52ce5e0a57bee36e28e31b7af71cfc01.tar.gz
Merge release-2.x.y changes, fix changelog conflicts
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 110d9f5822..fb59a51b95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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