| commit | 24bb7bfa6834b41018db239cbc967e96dbd34d36 | [log] [tgz] |
|---|---|---|
| author | Christopher Frost <frostc@vmware.com> | Thu Sep 23 11:19:27 2010 +0100 |
| committer | Christopher Frost <frostc@vmware.com> | Thu Sep 23 11:19:27 2010 +0100 |
| tree | 0215fd1f04c2b70b2ab479b2f5a939b13b1a23fe | |
| parent | 900d0281d2e87d71929f7287917700839f6f673d [diff] | |
| parent | ab64d9fba530971862628632007b6a7ec7d30b55 [diff] |
Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.osgi-extensions Conflicts: build.versions org.eclipse.virgo.osgi.extensions.equinox/.classpath org.eclipse.virgo.osgi.launcher/.classpath