summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Kramlich <grim@reaperworld.com>2018-05-25 18:41:53 -0500
committerGary Kramlich <grim@reaperworld.com>2018-05-25 18:41:53 -0500
commit4eb69877c02f1da0130b94ec5321d0913e849753 (patch)
tree70b5d7b9a45ca3be68d2ceef9ca5f0e53b7c322a
parent2970014f2208011ba806e9d03668daedd2a5a581 (diff)
downloadpidgin-4eb69877c02f1da0130b94ec5321d0913e849753.tar.gz
Update the COPYRIGHT and ChangeLog for the XEP-0198 support
-rw-r--r--COPYRIGHT1
-rw-r--r--ChangeLog3
2 files changed, 4 insertions, 0 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index d1475b7a4b..8fc80ce8ae 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -139,6 +139,7 @@ Steven Danna
Simon Danner
Chris Davies
Josh Davis
+defanor
Martijn Dekker
Florian Delizy
Jiri Denemark
diff --git a/ChangeLog b/ChangeLog
index 68e143577b..1dae0dac1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@ version 2.14.0 (??/??/????):
* Add invisible buddy support to support presence/name/photos for non buddies.
(#17295 PR 321 David Woodhouse)
+ XMPP:
+ * Support for XEP-0198 Stream Management (PR #309 defanor)
+
Voice & Video:
* Improve webcam failure handling. (PR #322 David Woodhouse)
* Show error when creating media pipeline fails. (#17290 PR 322 David Woodhouse)