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.edit | |
| 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.edit')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF index 42d9144fda..77eeac90ab 100644 --- a/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.edit; singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, org.eclipse.emf.ecore.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.edit;version="3.0.0", - org.eclipse.emf.cdo.eresource.provider;version="3.0.0", - org.eclipse.emf.cdo.internal.edit.messages;version="3.0.0";x-internal:=true + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport +Export-Package: org.eclipse.emf.cdo.edit;version="4.0.0", + org.eclipse.emf.cdo.eresource.provider;version="4.0.0", + org.eclipse.emf.cdo.internal.edit.messages;version="4.0.0";x-internal:=true |