summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Kramlich <grim@reaperworld.com>2018-07-30 20:32:21 -0500
committerGary Kramlich <grim@reaperworld.com>2018-07-30 20:32:21 -0500
commitb5b559de015781c3acb36a4b3dd509f7d01a842c (patch)
tree9290505fef7a738687dbe3861ee6433561735d36
parent5886e99e3e62dd6c9526c92078c07994304c3c27 (diff)
downloadpidgin-b5b559de015781c3acb36a4b3dd509f7d01a842c.tar.gz
Update the ChangeLog and COPYRIGHT for the Bonjour port fallback
-rw-r--r--COPYRIGHT1
-rw-r--r--ChangeLog3
2 files changed, 4 insertions, 0 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 7dae41f235..909020bb1b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -404,6 +404,7 @@ Bartosz Oler
Oliver
The openSUSE Project
Jürgen Orschiedt
+Michael Osborne
Stefan Ott
Shawn Outman
Nathan Owens (pianocomp81)
diff --git a/ChangeLog b/ChangeLog
index 5152175551..5bf0c50410 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@ version 2.14.0 (??/??/????):
* Make purple-remote compatible with both Python 2 and Python 3. (Jan
Synacek of RedHat)
+ Bonjour:
+ * Always use port fallback for IPv4 addresses. (PR #382 Michael Osborne)
+
XMPP:
* Support for XEP-0198 Stream Management (PR #309 defanor)