diff options
Diffstat (limited to 'org.jacoco.doc/docroot')
| -rw-r--r-- | org.jacoco.doc/docroot/doc/changes.html | 2 | ||||
| -rw-r--r-- | org.jacoco.doc/docroot/doc/maven.html | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html index e25ef8a5..02286ffa 100644 --- a/org.jacoco.doc/docroot/doc/changes.html +++ b/org.jacoco.doc/docroot/doc/changes.html @@ -23,6 +23,8 @@ <h3>New Features</h3> <ul> <li>Support for Android <i>Strict Mode</i> (GitHub #113).</li> + <li>New merge Mojo for Maven plug-in, contributed by Mads Mohr Christensen + (GitHub #126).</li> </ul> <h2>Release 0.6.3 (2013/06/03)</h2> diff --git a/org.jacoco.doc/docroot/doc/maven.html b/org.jacoco.doc/docroot/doc/maven.html index 0c113116..37c6fc56 100644 --- a/org.jacoco.doc/docroot/doc/maven.html +++ b/org.jacoco.doc/docroot/doc/maven.html @@ -88,6 +88,7 @@ mvn help:describe -Dplugin=org.jacoco:jacoco-maven-plugin -Ddetail <ul> <li><a href="help-mojo.html">help</a></li> <li><a href="prepare-agent-mojo.html">prepare-agent</a></li> + <li><a href="merge-mojo.html">report</a></li> <li><a href="report-mojo.html">report</a></li> <li><a href="check-mojo.html">check</a></li> <li><a href="instrument-mojo.html">instrument</a></li> |