summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Laager <rlaager@pidgin.im>2011-01-10 16:42:38 +0000
committerRichard Laager <rlaager@pidgin.im>2011-01-10 16:42:38 +0000
commitc35e939cc2cc2b7a8e924630e2efcd48822593ea (patch)
treeda31f6bfffe9208eaa37e830d1dad11f1ece1e4b
parent0c19c67db209f53043d003841b3a0059d5ee481c (diff)
downloadpidgin-c35e939cc2cc2b7a8e924630e2efcd48822593ea.tar.gz
Add some credit
-rw-r--r--ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7bf5e5d9f6..f9528795ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -934,7 +934,7 @@ version 2.6.0 (08/18/2009):
from you on MSN.
* Support sending an invite message to buddies when requesting
authorization from them on MSN.
- * Timeout switchboard connections aggressively (60 seconds).
+ * Timeout switchboard connections after 60 seconds (msn-pecan devs).
XMPP:
* Voice & Video support with Jingle (XEP-0166, 0167, 0176, & 0177),