Mercurial > pidgin
changeset 16865:38c134e2556b
merge of 'bf466048990ccb60520e0e2e3aec2fb084bf3bf6'
and 'dd1dbdb90917499ef006072e624eecd27708a816'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Fri, 04 May 2007 04:17:16 +0000 |
| parents | 90184b199e58 (current diff) 8c19752df0e6 (diff) |
| children | bd0335d2615b |
| files | ChangeLog |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Fri May 04 04:15:57 2007 +0000 +++ b/COPYRIGHT Fri May 04 04:17:16 2007 +0000 @@ -17,6 +17,7 @@ Christopher Ayoup Alex Badea John Bailey +R. Tyler Ballance Chris Banal Luca Barbato Levi Bard
--- a/ChangeLog Fri May 04 04:15:57 2007 +0000 +++ b/ChangeLog Fri May 04 04:17:16 2007 +0000 @@ -199,8 +199,9 @@ * Removed the Napster and TOC protocols plugins Other Noteworthy Changes: - * UPnP and NAT traversal support (Adam J. Warrington, Google Summer of + * NAT traversal support via UPnP (Adam J. Warrington, Google Summer of Code) + * NAT traversal support via NAT-PMP (Evan Schoenberg and R. Tyler Ballance) * The modify account dialog now contains two tabs, which should display better at lower resolutions (Sadrul Habib Chowdhury) * New "find buddy" results dialog (Alex Converse)