Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Hillairet2013-01-18 10:04:51 -0500
committerGuillaume Hillairet2013-01-18 10:04:51 -0500
commitb48afb0d4f4e6daa2b85803c0167ea18801b1e1a (patch)
treeeaf46146fbfb1150dd132f0f0ab0e798b478f379
parentea3de684e5cc8324f1a8e714eccbe95c7f83c021 (diff)
parentf949b05f54ff5aa73ae38a92adf335c2754a57a1 (diff)
downloadorg.eclipse.gmf-tooling-386838-templates-xtend2.tar.gz
org.eclipse.gmf-tooling-386838-templates-xtend2.tar.xz
org.eclipse.gmf-tooling-386838-templates-xtend2.zip
Merge branch 'master' of git://git.eclipse.org/gitroot/gmf-tooling/org.eclipse.gmf-tooling into 386838-templates-xtend2386838-templates-xtend2
-rw-r--r--plugins/org.eclipse.gmf.tooling.runtime/META-INF/MANIFEST.MF5
-rw-r--r--plugins/org.eclipse.gmf.tooling.runtime/plugin.properties2
2 files changed, 4 insertions, 3 deletions
diff --git a/plugins/org.eclipse.gmf.tooling.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.tooling.runtime/META-INF/MANIFEST.MF
index 5149a86b7..6a1ea1a5f 100644
--- a/plugins/org.eclipse.gmf.tooling.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.tooling.runtime/META-INF/MANIFEST.MF
@@ -4,6 +4,7 @@ Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmf.tooling.runtime;singleton:=true
Bundle-Version: 3.0.0.qualifier
Bundle-Vendor: %providerName
+Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.core.expressions,
@@ -14,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.gmf.runtime.common.ui.services,
org.eclipse.gmf.runtime.emf.type.core,
org.eclipse.gmf.runtime.diagram.core,
- org.eclipse.gmf.runtime.diagram.ui,
+ org.eclipse.gmf.runtime.diagram.ui,
org.eclipse.ocl,
org.eclipse.ocl.ecore,
org.eclipse.gmf.runtime.notation
@@ -24,9 +25,9 @@ Bundle-Activator: org.eclipse.gmf.tooling.runtime.GMFToolingRuntimePlugin
Export-Package: org.eclipse.gmf.tooling.runtime,
org.eclipse.gmf.tooling.runtime.directedit,
org.eclipse.gmf.tooling.runtime.directedit.locator,
- org.eclipse.gmf.tooling.runtime.edit.helpers,
org.eclipse.gmf.tooling.runtime.draw2d,
org.eclipse.gmf.tooling.runtime.draw2d.labels,
+ org.eclipse.gmf.tooling.runtime.edit.helpers,
org.eclipse.gmf.tooling.runtime.edit.policies.effect,
org.eclipse.gmf.tooling.runtime.edit.policies.labels,
org.eclipse.gmf.tooling.runtime.edit.policies.reparent,
diff --git a/plugins/org.eclipse.gmf.tooling.runtime/plugin.properties b/plugins/org.eclipse.gmf.tooling.runtime/plugin.properties
index bd10ff6e0..e97401f5d 100644
--- a/plugins/org.eclipse.gmf.tooling.runtime/plugin.properties
+++ b/plugins/org.eclipse.gmf.tooling.runtime/plugin.properties
@@ -8,5 +8,5 @@
# Contributors:
# Montages AG - initial API and implementation
###############################################################################
-featureName=GMF Tooling-Specific Runtime Extensions Plugin
+pluginName=GMF Tooling-Specific Runtime Extensions Plugin
providerName=Eclipse Modeling Project

Back to the top