diff options
| author | Evgeny Mandrikov <mandrikov@gmail.com> | 2012-12-26 19:31:55 +0100 |
|---|---|---|
| committer | Evgeny Mandrikov <mandrikov@gmail.com> | 2012-12-26 19:31:55 +0100 |
| commit | b3fd3717f2a4c2095fba98106843992e4fbd4d84 (patch) | |
| tree | 695a96cb2bfbc6be75e8f9d35f4cc2f29f171a31 /org.jacoco.agent.rt | |
| parent | ad8749dace1130caf442704d302e178dd29089b7 (diff) | |
| parent | 4a77e4024a2d40cfc50a6e4213842cbe0758de14 (diff) | |
| download | jacoco-b3fd3717f2a4c2095fba98106843992e4fbd4d84.tar.gz | |
Merge branch 'master' into topic/offlineinstr
Conflicts:
org.jacoco.ant/META-INF/MANIFEST.MF
Diffstat (limited to 'org.jacoco.agent.rt')
| -rw-r--r-- | org.jacoco.agent.rt/pom.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.jacoco.agent.rt/pom.xml b/org.jacoco.agent.rt/pom.xml index bcf06294..52738e66 100644 --- a/org.jacoco.agent.rt/pom.xml +++ b/org.jacoco.agent.rt/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.jacoco</groupId> <artifactId>org.jacoco.build</artifactId> - <version>0.6.1-SNAPSHOT</version> + <version>0.6.2-SNAPSHOT</version> <relativePath>../org.jacoco.build</relativePath> </parent> |