propagate from branch 'i2p.i2p.zzz.upnp' (head 348acc252da725bc621791ef811a43943e889833)

to branch 'i2p.i2p' (head 264d0119a37e276dce2996f360f9c8e065b30008)
2009-05-17 12:28:27 +00:00
parent 9a6a993a81 aa2f9e34c0
commit b59a38ffad
137 changed files with 18845 additions and 328 deletions
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -67,7 +67,17 @@ Public domain except as listed below:


 Router:
-Public domain
+Public domain except as listed below:
+   UPnP.java:
+   From freenet
+   See licenses/LICENSE-GPLv2.txt
+
+   UPnP subsystem:
+   Copyright (C) 2003-2006 Satoshi Konno
+   See licenses/LICENSE-UPnP.txt
+
+   XMLPull library used by UPnP:
+   See licenses/LICENSE-Apache2.0.txt