commit | 82eb8cfa060d258bf66809237a6119598b458f68 | [log] [tgz] |
---|---|---|
author | Borislav Kapukaranov <b.kapukaranov@gmail.com> | Wed Jul 18 10:37:01 2012 +0300 |
committer | Borislav Kapukaranov <b.kapukaranov@gmail.com> | Wed Jul 18 10:37:01 2012 +0300 |
tree | bcb8f38b4313514112132cfc8793ed49d83e42e7 | |
parent | 4039dcee1700c6b98916cde03abede9d354c549f [diff] | |
parent | 0420b5ebd5500f55e6788e6efb2f3a594c73ee83 [diff] |
Merge branch 'juno-contribution' into 380765-shared-ivycache Conflicts: org.eclipse.virgo.osgi.console/ivy.xml org.eclipse.virgo.osgi.extensions.equinox/ivy.xml org.eclipse.virgo.osgi.launcher/ivy.xml org.eclipse.virgo.osgi.launcher/smoke-test.xml