diff options
| author | Eike Stepper | 2010-07-07 16:55:10 +0000 |
|---|---|---|
| committer | Eike Stepper | 2010-07-07 16:55:10 +0000 |
| commit | c4d3ed8b70f2118652389b604a48c8846866f0ee (patch) | |
| tree | 371a60f9a72c160a7e8ee7868ab2ab6b02a60c21 /plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram | |
| parent | e226589b37d964e9d58de60b4ecdc8a66f52a96f (diff) | |
| download | cdo-c4d3ed8b70f2118652389b604a48c8846866f0ee.tar.gz cdo-c4d3ed8b70f2118652389b604a48c8846866f0ee.tar.xz cdo-c4d3ed8b70f2118652389b604a48c8846866f0ee.zip | |
[319090] Provide a CDOConflictResolver that uses a CDOMerger
https://bugs.eclipse.org/bugs/show_bug.cgi?id=319090
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/META-INF/MANIFEST.MF | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/META-INF/MANIFEST.MF index bbffece676..a9d40523f6 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/META-INF/MANIFEST.MF @@ -2,21 +2,21 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.diagram; singleton:=true -Bundle-Version: 0.2.0.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin -Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.parsers;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.sheet;version="0.2.0" +Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.parsers;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.sheet;version="1.0.0" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)", @@ -41,7 +41,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.gmf.runtime.draw2d.ui;bundle-version="[1.4.0,2.0.0)";visibility:=reexport, org.eclipse.gef;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, org.eclipse.draw2d;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.dawn.examples.acore;bundle-version="[0.2.0,1.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.dawn.examples.acore.edit;bundle-version="[0.2.0,1.0.0)";visibility:=reexport + org.eclipse.emf.cdo.dawn.examples.acore;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.cdo.dawn.examples.acore.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 |