Changeset f57f49c3 for LICENSE.txt


Ignore:
Timestamp:
Jan 13, 2013 12:38:05 PM (7 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
4ba8f02
Parents:
8d2eff76 (diff), 4f14677 (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' (head f33e0980fd48ba4acda12d2079f2a4834a710ae4)

to branch 'i2p.i2p.zzz.jetty7' (head bd1a64f7262ad5bbea3529675f1f055b9ad257a8)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • LICENSE.txt

    r8d2eff76 rf57f49c3  
    7373   See licenses/LICENSE-BlockFile.txt
    7474
     75   SipHashInline:
     76   Copyright 2012  Hiroshi Nakamura <nahi@ruby-lang.org>
     77   See licenses/LICENSE-Apache2.0.txt
    7578
    7679Router (router.jar):
     
    240243      See licenses/LICENSE-LGPLv2.1.txt
    241244
    242    Tomcat 6.0.35:
    243    Copyright 1999-2011 The Apache Software Foundation
     245   Tomcat 6.0.36:
     246   Copyright 1999-2012 The Apache Software Foundation
    244247   See licenses/LICENSE-Apache2.0.txt
    245248   See licenses/NOTICE-Tomcat.txt
Note: See TracChangeset for help on using the changeset viewer.