Changeset f8d323b for LICENSE.txt


Ignore:
Timestamp:
Apr 7, 2013 1:20:34 PM (7 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
56eba28a
Parents:
7b753c9d (diff), 18e369b (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 5737078c5993e2fcf73520cc610a71125b12520b)

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • LICENSE.txt

    r7b753c9d rf8d323b  
    178178   See licenses/LICENSE-GPLv2.txt
    179179
    180    Jetty 6.1.26:
    181    Copyright 1995-2009 Mort Bay Consulting Pty Ltd
    182    See licenses/LICENSE-Jetty.txt
    183    See licenses/LICENSE-Apache2.0.txt
     180   Jetty 7.6.8.v20121106:
     181   See licenses/ABOUT-Jetty.html
     182   See licenses/NOTICE-Jetty.html
     183   See licenses/LICENSE-Apache2.0.txt
     184   See licenses/LICENSE-ECLIPSE-1.0.html
    184185   See licenses/NOTICE-Commons-Logging.txt
    185186
Note: See TracChangeset for help on using the changeset viewer.