Changeset c4a0fcbf


Ignore:
Timestamp:
Dec 10, 2012 5:23:29 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
9f6ebd8e
Parents:
863a05b (diff), 8104cb4 (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 99b582d7fcc9d377341809a5fe580b439b37fea6)

to branch 'i2p.i2p.zzz.test2' (head f620dc8ce09657b3bfe0d87b5ee09c1bc33c31d1)

Files:
9 edited

Legend:

Unmodified
Added
Removed
  • LICENSE.txt

    r863a05b rc4a0fcbf  
    239239      See licenses/LICENSE-LGPLv2.1.txt
    240240
    241    Tomcat 6.0.35:
    242    Copyright 1999-2011 The Apache Software Foundation
     241   Tomcat 6.0.36:
     242   Copyright 1999-2012 The Apache Software Foundation
    243243   See licenses/LICENSE-Apache2.0.txt
    244244   See licenses/NOTICE-Tomcat.txt
  • apps/jetty/apache-tomcat-deployer/NOTICE

    r863a05b rc4a0fcbf  
    11Apache Tomcat
    2 Copyright 1999-2011 The Apache Software Foundation
     2Copyright 1999-2012 The Apache Software Foundation
    33
    44This product includes software developed by
  • apps/jetty/apache-tomcat-deployer/README-i2p.txt

    r863a05b rc4a0fcbf  
    33
    44Retrieved from the file
    5         apache-tomcat-6.0.35-deployer.tar.gz
     5        apache-tomcat-6.0.36-deployer.tar.gz
    66
    77minus the following files and directores:
Note: See TracChangeset for help on using the changeset viewer.