| commit | bb4f377ff7f9fab4545260c8effdf10b7cf9e691 | [log] [tgz] |
|---|---|---|
| author | Borislav Kapukaranov <b.kapukaranov@gmail.com> | Tue Aug 14 13:18:42 2012 +0300 |
| committer | Borislav Kapukaranov <b.kapukaranov@gmail.com> | Tue Aug 14 13:18:42 2012 +0300 |
| tree | f3228618495b266d301cac4ef55cd794ca23adf8 | |
| parent | 911830c3686bf9ece65ccc1f274583d386e26999 [diff] | |
| parent | 2b35bbe1a2c6524891d2c96f33ae22388e2f5f59 [diff] |
Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.test into 380765-shared-ivycache Conflicts: build.versions org.eclipse.virgo.test.framework/ivy.xml org.eclipse.virgo.test.framework/src/main/java/org/eclipse/virgo/test/framework/OsgiTestRunner.java org.eclipse.virgo.test.launcher/ivy.xml org.eclipse.virgo.test.launcher/smoke-test.xml