| commit | 625f3bd912b788d011844682fc38df24e3972b96 | [log] [tgz] |
|---|---|---|
| author | philippe dul <philippe.dul@thalesgroup.com> | Fri Jun 10 08:23:40 2016 -0400 |
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | Fri Jun 10 08:23:40 2016 -0400 |
| tree | 877591bdd27bad77ff0a3f31c80e85f6ec12de28 | |
| parent | 42e382e9539cc22205a0e1cd2ee63086d416d34c [diff] | |
| parent | 8ad61a0793734d9ecf0e806591dbd7c4e1e831fc [diff] |
Merge "[Activity Explorer] Popup-menu diagram creation not managed by filters"
diff --git a/features/org.eclipse.amalgam.discovery-feature/feature.xml b/features/org.eclipse.amalgam.discovery-feature/feature.xml index 5e1e1d3..fa570f9 100644 --- a/features/org.eclipse.amalgam.discovery-feature/feature.xml +++ b/features/org.eclipse.amalgam.discovery-feature/feature.xml
@@ -24,11 +24,6 @@ %license </license> - <url> - <update label="Eclipse Modeling Project Updates" url="http://www.eclipse.org/modeling/updates"/> - <discovery label="Eclipse Modeling Project Updates" url="http://www.eclipse.org/modeling/updates"/> - </url> - <plugin id="org.eclipse.amalgam.discovery.core" download-size="0"
diff --git a/features/org.eclipse.amalgam.explorer.contextual-feature/feature.xml b/features/org.eclipse.amalgam.explorer.contextual-feature/feature.xml index 60ac1c4..0db8d44 100644 --- a/features/org.eclipse.amalgam.explorer.contextual-feature/feature.xml +++ b/features/org.eclipse.amalgam.explorer.contextual-feature/feature.xml
@@ -13,7 +13,9 @@ id="org.eclipse.amalgam.explorer.contextual" label="%featureName" version="1.7.0.qualifier" - provider-name="%providerName"> + provider-name="%providerName" + license-feature="org.eclipse.license" + license-feature-version="0.0.0"> <description> %description
diff --git a/features/org.eclipse.amalgam.explorer.contextual.core-feature/feature.xml b/features/org.eclipse.amalgam.explorer.contextual.core-feature/feature.xml index e2bd977..2c055b9 100644 --- a/features/org.eclipse.amalgam.explorer.contextual.core-feature/feature.xml +++ b/features/org.eclipse.amalgam.explorer.contextual.core-feature/feature.xml
@@ -13,7 +13,9 @@ id="org.eclipse.amalgam.explorer.contextual.core" label="%featureName" version="1.7.0.qualifier" - provider-name="%providerName"> + provider-name="%providerName" + license-feature="org.eclipse.license" + license-feature-version="0.0.0"> <description> %description
diff --git a/features/org.eclipse.amalgam.explorer.contextual.sirius-feature/feature.xml b/features/org.eclipse.amalgam.explorer.contextual.sirius-feature/feature.xml index 6593fcc..c8ad3f1 100644 --- a/features/org.eclipse.amalgam.explorer.contextual.sirius-feature/feature.xml +++ b/features/org.eclipse.amalgam.explorer.contextual.sirius-feature/feature.xml
@@ -13,7 +13,9 @@ id="org.eclipse.amalgam.explorer.contextual.sirius" label="%featureName" version="1.7.0.qualifier" - provider-name="%providerName"> + provider-name="%providerName" + license-feature="org.eclipse.license" + license-feature-version="0.0.0"> <description> %description