Changeset 85a8b58


Ignore:
Timestamp:
Nov 9, 2011 6:30:48 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
6a23475
Parents:
5efd19e
Message:

License corrections that should make things more compatible:

Jetty and commons logging are now Apache 2.0 (not 1.1)
systray4j.jar is LGPL (not GPL)
Note where a later GPL version is allowed

Files:
2 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • LICENSE.txt

    r5efd19e r85a8b58  
    9898
    9999        Commons Logging (http://jakarta.apache.org/commons/logging/)
    100         See licenses/LICENSE-Apache1.1.txt
     100        See licenses/LICENSE-Apache2.0.txt
    101101        See licenses/NOTICE-Commons-Logging.txt
    102102
    … …  
    157157   I2PSnark:
    158158   Copyright (C) 2003 Mark J. Wielaard
     159   GPLv2 (or any later version)
    159160   See licenses/LICENSE-GPLv2.txt
    160161       Silk icons: See licenses/LICENSE-SilkIcons.txt
    … …  
    162163   I2PTunnel:
    163164   (c) 2003 - 2004 mihi
    164    GPLv2 with exception.
     165   GPLv2 (or any later version) with exception.
    165166   See licenses/LICENSE-I2PTunnel.txt
    166167   See licenses/LICENSE-GPLv2.txt
    … …  
    168169   I2PTunnel SOCKS Proxy:
    169170   Copyright (c) 2004 by human
    170    GPLv2 with exception.
     171   GPLv2 (or any later version) with exception.
    171172   See licenses/LICENSE-I2PTunnel.txt
    172173   See licenses/LICENSE-GPLv2.txt
    … …  
    178179   Jetty 5.1.15:
    179180   Copyright 2000-2004 Mort Bay Consulting Pty. Ltd.
    180    See licenses/LICENSE-Apache1.1.txt
    181181   See licenses/LICENSE-Apache2.0.txt
    182182   See licenses/NOTICE-Commons-Logging.txt
    … …  
    218218   SusiDNS:
    219219   Copyright (C) 2005 <susi23@mail.i2p>
     220   GPLv2 (or any later version)
    220221   See licenses/LICENSE-GPLv2.txt
    221222       Uses Apache Jakarta Standard Tag Library 1.1.2:
    … …  
    224225   SusiMail:
    225226   Copyright (C) 2004-2005  <susi23@mail.i2p>
     227   GPLv2 (or any later version)
    226228   See licenses/LICENSE-GPLv2.txt
    227229
    228230   Systray:
    229231   Public domain.
    230       Bundles systray4j code:
    231       See licenses/LICENSE-GPLv2.txt
     232      Bundles systray4j-2.4.1:
     233      See licenses/LICENSE-LGPLv2.1.txt
    232234
    233235

  • apps/systray/doc/README.txt

    r5efd19e r85a8b58  
    1010
    1111
    12 systray4j is GPLv2, see LICENSE.systray4j.txt.
     12systray4j.dll is LGPLv2.1, see ../../../licenses/LICENSE-LGPLv2.1.txt
     13systray4j.jar for Windows is LGPLv2.1, see ../../../licenses/LICENSE-LGPLv2.1.txt
     14Reference: http://systray.sourceforge.net/
    1315I2P systray code in ../java/src is public domain.
    1416
Note: See TracChangeset for help on using the changeset viewer.