changeset 16875:8c19752df0e6

merge of '2882b6ab8f7547ad0d1682e61648c6fe29a36f8a' and '5cfdf53a0df94294f9feecae6d7dd22133bcb9ad'
author Evan Schoenberg <evan.s@dreskin.net>
date Fri, 04 May 2007 04:14:46 +0000
parents 38b3ca4b353d (current diff) 1a1e5a68990c (diff)
children 38c134e2556b
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/COPYRIGHT	Fri May 04 04:12:17 2007 +0000
+++ b/COPYRIGHT	Fri May 04 04:14:46 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:12:17 2007 +0000
+++ b/ChangeLog	Fri May 04 04:14:46 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)