| commit | dc151b24589c08dac9802e33b3f4d476ce2c30e4 | [log] [tgz] |
|---|---|---|
| author | Borislav Kapukaranov <b.kapukaranov@gmail.com> | Sat Aug 04 23:50:12 2012 +0300 |
| committer | Borislav Kapukaranov <b.kapukaranov@gmail.com> | Sat Aug 04 23:50:12 2012 +0300 |
| tree | bf519ec84e69a51066976d48f4b9cb8bb0172a77 | |
| parent | 827fa315ec4e45d3196d424c2a7cc956d0fdbc39 [diff] | |
| parent | 850fa73c783f7921f24d6346551affa0f0d3985c [diff] |
Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.test into 380765-shared-ivycache Conflicts: org.eclipse.virgo.test.framework/ivy.xml