diff options
| author | Igor Fedorenko | 2011-08-05 05:27:31 +0000 |
|---|---|---|
| committer | Igor Fedorenko | 2011-08-05 05:27:31 +0000 |
| commit | e9906682edabd97d15907ce5e17daae20519a08d (patch) | |
| tree | 20114c863c7040c2bb6ba51bcf2a78e87dd5118b /org.eclipse.m2e.sdk.feature | |
| parent | 093352787bc8b48dfebd094d2967760491550e3e (diff) | |
| parent | 61820ff65bb40aaf98c5302942733ae244dabe7f (diff) | |
| download | m2e-core-e9906682edabd97d15907ce5e17daae20519a08d.tar.gz m2e-core-e9906682edabd97d15907ce5e17daae20519a08d.tar.xz m2e-core-e9906682edabd97d15907ce5e17daae20519a08d.zip | |
Merge remote-tracking branch 'origin/master' into m2e-self-hosting
Conflicts:
org.eclipse.m2e.integration.tests.common/.settings/org.eclipse.jdt.core.prefs
org.eclipse.m2e.integration.tests.common/pom.xml
pom.xml
Diffstat (limited to 'org.eclipse.m2e.sdk.feature')
| -rw-r--r-- | org.eclipse.m2e.sdk.feature/feature.xml | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/org.eclipse.m2e.sdk.feature/feature.xml b/org.eclipse.m2e.sdk.feature/feature.xml index 0cd74672..b66e6a4a 100644 --- a/org.eclipse.m2e.sdk.feature/feature.xml +++ b/org.eclipse.m2e.sdk.feature/feature.xml @@ -33,20 +33,6 @@ version="0.0.0" unpack="false"/> - <plugin - id="org.eclipse.m2e.integration.tests.common" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.m2e.integration.tests.common.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - <!-- source bundles from main feature --> <plugin |