Changeset b59a38ff for LICENSE.txt


Ignore:
Timestamp:
May 17, 2009 12:28:27 PM (11 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
631cd37
Parents:
9a6a993a (diff), aa2f9e3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

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

to branch 'i2p.i2p' (head 264d0119a37e276dce2996f360f9c8e065b30008)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • LICENSE.txt

    r9a6a993a rb59a38ff  
    6868
    6969Router:
    70 Public domain
     70Public domain except as listed below:
     71   UPnP.java:
     72   From freenet
     73   See licenses/LICENSE-GPLv2.txt
     74
     75   UPnP subsystem:
     76   Copyright (C) 2003-2006 Satoshi Konno
     77   See licenses/LICENSE-UPnP.txt
     78
     79   XMLPull library used by UPnP:
     80   See licenses/LICENSE-Apache2.0.txt
    7181
    7282
Note: See TracChangeset for help on using the changeset viewer.