Clone
Stefan Bodewig
committed
on 12 Apr 16
Merge branch '1.9.x'
Conflicts:
WHATSNEW
build.xml
manual/cover.html
manual/credits.html
release/ivy.xml
src/etc/poms/ant-antlr/pom.xm… Show more
Merge branch '1.9.x'

Conflicts:

        WHATSNEW

        build.xml

        manual/cover.html

        manual/credits.html

        release/ivy.xml

        src/etc/poms/ant-antlr/pom.xml

        src/etc/poms/ant-apache-bcel/pom.xml

        src/etc/poms/ant-apache-bsf/pom.xml

        src/etc/poms/ant-apache-log4j/pom.xml

        src/etc/poms/ant-apache-oro/pom.xml

        src/etc/poms/ant-apache-regexp/pom.xml

        src/etc/poms/ant-apache-resolver/pom.xml

        src/etc/poms/ant-apache-xalan2/pom.xml

        src/etc/poms/ant-commons-logging/pom.xml

        src/etc/poms/ant-commons-net/pom.xml

        src/etc/poms/ant-jai/pom.xml

        src/etc/poms/ant-javamail/pom.xml

        src/etc/poms/ant-jdepend/pom.xml

        src/etc/poms/ant-jmf/pom.xml

        src/etc/poms/ant-jsch/pom.xml

        src/etc/poms/ant-junit/pom.xml

        src/etc/poms/ant-junit4/pom.xml

        src/etc/poms/ant-launcher/pom.xml

        src/etc/poms/ant-netrexx/pom.xml

        src/etc/poms/ant-swing/pom.xml

        src/etc/poms/ant-testutil/pom.xml

        src/etc/poms/ant/pom.xml

        src/etc/poms/pom.xml

        src/etc/testcases/taskdefs/conditions/antversion.xml

Show less

master + 3 more